From: Tejun Heo Date: Sun, 6 Feb 2005 02:02:31 +0000 (+0100) Subject: [ide aec62xx] remove SPLIT_BYTE() and MAKE_WORD() macros X-Git-Tag: v2.6.11-rc4~16^2~28^2~18 X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=442b13f5d6a44f012c3f7410cedd8cdc28e8b257;p=history.git [ide aec62xx] remove SPLIT_BYTE() and MAKE_WORD() macros bart: leave BUSCLOCK() alone for now Signed-off-by: Tejun Heo Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 34774406518d..39d6b0ef483f 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c @@ -101,8 +101,7 @@ static int aec6210_tune_chipset (ide_drive_t *drive, u8 xferspeed) /* 0x40|(2*drive->dn): Active, 0x41|(2*drive->dn): Recovery */ pci_read_config_word(dev, 0x40|(2*drive->dn), &d_conf); tmp0 = pci_bus_clock_list(speed, BUSCLOCK(dev)); - SPLIT_BYTE(tmp0,tmp1,tmp2); - MAKE_WORD(d_conf,tmp1,tmp2); + d_conf = ((tmp0 & 0xf0) << 4) | (tmp0 & 0xf); pci_write_config_word(dev, 0x40|(2*drive->dn), d_conf); tmp1 = 0x00; diff --git a/drivers/ide/pci/aec62xx.h b/drivers/ide/pci/aec62xx.h index 0a7ba1563263..ef7109c6c2df 100644 --- a/drivers/ide/pci/aec62xx.h +++ b/drivers/ide/pci/aec62xx.h @@ -51,13 +51,6 @@ static struct chipset_bus_clock_list_entry aec6xxx_34_base [] = { { 0, 0x00, 0x00 } }; -#ifndef SPLIT_BYTE -#define SPLIT_BYTE(B,H,L) ((H)=(B>>4), (L)=(B-((B>>4)<<4))) -#endif -#ifndef MAKE_WORD -#define MAKE_WORD(W,HB,LB) ((W)=((HB<<8)+LB)) -#endif - #define BUSCLOCK(D) \ ((struct chipset_bus_clock_list_entry *) pci_get_drvdata((D)))