Skip to content

L
linux
Commit a326b02b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files
Options

ide: drop 'name' parameter from ->init_chipset method 

There should be no functional changes caused by this patch.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ced3ec8a
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 48 deletions
drivers/ide/pci/aec62xx.c
View file @ a326b02b
...@@ -140,7 +140,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -140,7 +140,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0); drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0);
} }
static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev)
{ {
/* These are necessary to get AEC6280 Macintosh cards to work */ /* These are necessary to get AEC6280 Macintosh cards to work */
if ((dev->device == PCI_DEVICE_ID_ARTOP_ATP865) || if ((dev->device == PCI_DEVICE_ID_ARTOP_ATP865) ||
......
drivers/ide/pci/alim15x3.c
View file @ a326b02b
...@@ -209,13 +209,12 @@ static int ali15x3_dma_setup(ide_drive_t *drive) ...@@ -209,13 +209,12 @@ static int ali15x3_dma_setup(ide_drive_t *drive)
/** /**
* init_chipset_ali15x3 - Initialise an ALi IDE controller * init_chipset_ali15x3 - Initialise an ALi IDE controller
* @dev: PCI device * @dev: PCI device
* @name: Name of the controller
* *
* This function initializes the ALI IDE controller and where * This function initializes the ALI IDE controller and where
* appropriate also sets up the 1533 southbridge. * appropriate also sets up the 1533 southbridge.
*/ */
static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_ali15x3(struct pci_dev *dev)
{ {
unsigned long flags; unsigned long flags;
u8 tmpbyte; u8 tmpbyte;
......
drivers/ide/pci/amd74xx.c
View file @ a326b02b
...@@ -112,15 +112,13 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -112,15 +112,13 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)
amd_set_drive(drive, XFER_PIO_0 + pio); amd_set_drive(drive, XFER_PIO_0 + pio);
} }
static void __devinit amd7409_cable_detect(struct pci_dev *dev, static void __devinit amd7409_cable_detect(struct pci_dev *dev)
const char *name)
{ {
/* no host side cable detection */ /* no host side cable detection */
amd_80w = 0x03; amd_80w = 0x03;
} }
static void __devinit amd7411_cable_detect(struct pci_dev *dev, static void __devinit amd7411_cable_detect(struct pci_dev *dev)
const char *name)
{ {
int i; int i;
u32 u = 0; u32 u = 0;
...@@ -131,9 +129,9 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev, ...@@ -131,9 +129,9 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev,
amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0); amd_80w = ((t & 0x3) ? 1 : 0) | ((t & 0xc) ? 2 : 0);
for (i = 24; i >= 0; i -= 8) for (i = 24; i >= 0; i -= 8)
if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) { if (((u >> i) & 4) && !(amd_80w & (1 << (1 - (i >> 4))))) {
printk(KERN_WARNING "%s %s: BIOS didn't set cable bits " printk(KERN_WARNING DRV_NAME " %s: BIOS didn't set "
"correctly. Enabling workaround.\n", "cable bits correctly. Enabling workaround.\n",
name, pci_name(dev)); pci_name(dev));
amd_80w |= (1 << (1 - (i >> 4))); amd_80w |= (1 << (1 - (i >> 4)));
} }
} }
...@@ -142,8 +140,7 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev, ...@@ -142,8 +140,7 @@ static void __devinit amd7411_cable_detect(struct pci_dev *dev,
* The initialization callback. Initialize drive independent registers. * The initialization callback. Initialize drive independent registers.
*/ */
static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev)
const char *name)
{ {
u8 t = 0, offset = amd_offset(dev); u8 t = 0, offset = amd_offset(dev);
...@@ -156,9 +153,9 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, ...@@ -156,9 +153,9 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev,
; /* no UDMA > 2 */ ; /* no UDMA > 2 */
else if (dev->vendor == PCI_VENDOR_ID_AMD && else if (dev->vendor == PCI_VENDOR_ID_AMD &&
dev->device == PCI_DEVICE_ID_AMD_VIPER_7409) dev->device == PCI_DEVICE_ID_AMD_VIPER_7409)
amd7409_cable_detect(dev, name); amd7409_cable_detect(dev);
else else
amd7411_cable_detect(dev, name); amd7411_cable_detect(dev);
/* /*
* Take care of prefetch & postwrite. * Take care of prefetch & postwrite.
......
drivers/ide/pci/cmd64x.c
View file @ a326b02b
...@@ -332,7 +332,7 @@ static int cmd646_1_dma_end(ide_drive_t *drive) ...@@ -332,7 +332,7 @@ static int cmd646_1_dma_end(ide_drive_t *drive)
return (dma_stat & 7) != 4; return (dma_stat & 7) != 4;
} }
static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev)
{ {
u8 mrdmode = 0; u8 mrdmode = 0;
......
drivers/ide/pci/cs5530.c
View file @ a326b02b
...@@ -129,12 +129,11 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode) ...@@ -129,12 +129,11 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)
/** /**
* init_chipset_5530 - set up 5530 bridge * init_chipset_5530 - set up 5530 bridge
* @dev: PCI device * @dev: PCI device
* @name: device name
* *
* Initialize the cs5530 bridge for reliable IDE DMA operation. * Initialize the cs5530 bridge for reliable IDE DMA operation.
*/ */
static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_cs5530(struct pci_dev *dev)
{ {
struct pci_dev *master_0 = NULL, *cs5530_0 = NULL; struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
...@@ -153,11 +152,11 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch ...@@ -153,11 +152,11 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
} }
} }
if (!master_0) { if (!master_0) {
printk(KERN_ERR "%s: unable to locate PCI MASTER function\n", name); printk(KERN_ERR DRV_NAME ": unable to locate PCI MASTER function\n");
goto out; goto out;
} }
if (!cs5530_0) { if (!cs5530_0) {
printk(KERN_ERR "%s: unable to locate CS5530 LEGACY function\n", name); printk(KERN_ERR DRV_NAME ": unable to locate CS5530 LEGACY function\n");
goto out; goto out;
} }
......
drivers/ide/pci/cy82c693.c
View file @ a326b02b
...@@ -332,7 +332,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -332,7 +332,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
/* /*
* this function is called during init and is used to setup the cy82c693 chip * this function is called during init and is used to setup the cy82c693 chip
*/ */
static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev)
{ {
if (PCI_FUNC(dev->devfn) != 1) if (PCI_FUNC(dev->devfn) != 1)
return 0; return 0;
...@@ -351,8 +351,8 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c ...@@ -351,8 +351,8 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c
data = inb(CY82_DATA_PORT); data = inb(CY82_DATA_PORT);
#if CY82C693_DEBUG_INFO #if CY82C693_DEBUG_INFO
printk(KERN_INFO "%s: Peripheral Configuration Register: 0x%X\n", printk(KERN_INFO DRV_NAME ": Peripheral Configuration Register: 0x%X\n",
name, data); data);
#endif /* CY82C693_DEBUG_INFO */ #endif /* CY82C693_DEBUG_INFO */
/* /*
...@@ -373,8 +373,8 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c ...@@ -373,8 +373,8 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c
outb(data, CY82_DATA_PORT); outb(data, CY82_DATA_PORT);
#if CY82C693_DEBUG_INFO #if CY82C693_DEBUG_INFO
printk(KERN_INFO "%s: New Peripheral Configuration Register: 0x%X\n", printk(KERN_INFO ": New Peripheral Configuration Register: 0x%X\n",
name, data); data);
#endif /* CY82C693_DEBUG_INFO */ #endif /* CY82C693_DEBUG_INFO */
#endif /* CY82C693_SETDMA_CLOCK */ #endif /* CY82C693_SETDMA_CLOCK */
......
drivers/ide/pci/hpt34x.c
View file @ a326b02b
...@@ -79,7 +79,7 @@ static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio) ...@@ -79,7 +79,7 @@ static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio)
*/ */
#define HPT34X_PCI_INIT_REG 0x80 #define HPT34X_PCI_INIT_REG 0x80
static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev)
{ {
int i = 0; int i = 0;
unsigned long hpt34xIoBase = pci_resource_start(dev, 4); unsigned long hpt34xIoBase = pci_resource_start(dev, 4);
......
drivers/ide/pci/hpt366.c
View file @ a326b02b
...@@ -970,11 +970,12 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f ...@@ -970,11 +970,12 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f
return 1; return 1;
} }
static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)
{ {
unsigned long io_base = pci_resource_start(dev, 4); unsigned long io_base = pci_resource_start(dev, 4);
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct hpt_info *info = host->host_priv + (&dev->dev == host->dev[1]); struct hpt_info *info = host->host_priv + (&dev->dev == host->dev[1]);
const char *name = DRV_NAME;
u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */ u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */
u8 chip_type; u8 chip_type;
enum ata_clock clock; enum ata_clock clock;
......
drivers/ide/pci/it821x.c
View file @ a326b02b
...@@ -605,7 +605,7 @@ static void __devinit it8212_disable_raid(struct pci_dev *dev) ...@@ -605,7 +605,7 @@ static void __devinit it8212_disable_raid(struct pci_dev *dev)
pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20); pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x20);
} }
static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev)
{ {
u8 conf; u8 conf;
static char *mode[2] = { "pass through", "smart" }; static char *mode[2] = { "pass through", "smart" };
......
drivers/ide/pci/pdc202xx_new.c
View file @ a326b02b
...@@ -326,8 +326,9 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev) ...@@ -326,8 +326,9 @@ static void __devinit apple_kiwi_init(struct pci_dev *pdev)
} }
#endif /* CONFIG_PPC_PMAC */ #endif /* CONFIG_PPC_PMAC */
static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev)
{ {
const char *name = DRV_NAME;
unsigned long dma_base = pci_resource_start(dev, 4); unsigned long dma_base = pci_resource_start(dev, 4);
unsigned long sec_dma_base = dma_base + 0x08; unsigned long sec_dma_base = dma_base + 0x08;
long pll_input, pll_output, ratio; long pll_input, pll_output, ratio;
......
drivers/ide/pci/pdc202xx_old.c
View file @ a326b02b
...@@ -265,8 +265,7 @@ static void pdc202xx_dma_timeout(ide_drive_t *drive) ...@@ -265,8 +265,7 @@ static void pdc202xx_dma_timeout(ide_drive_t *drive)
ide_dma_timeout(drive); ide_dma_timeout(drive);
} }
static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev, static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev)
const char *name)
{ {
unsigned long dmabase = pci_resource_start(dev, 4); unsigned long dmabase = pci_resource_start(dev, 4);
u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0; u8 udma_speed_flag = 0, primary_mode = 0, secondary_mode = 0;
......
drivers/ide/pci/piix.c
View file @ a326b02b
...@@ -200,13 +200,12 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -200,13 +200,12 @@ static void piix_set_dma_mode(ide_drive_t *drive, const u8 speed)
/** /**
* init_chipset_ich - set up the ICH chipset * init_chipset_ich - set up the ICH chipset
* @dev: PCI device to set up * @dev: PCI device to set up
* @name: Name of the device
* *
* Initialize the PCI device as required. For the ICH this turns * Initialize the PCI device as required. For the ICH this turns
* out to be nice and simple. * out to be nice and simple.
*/ */
static unsigned int __devinit init_chipset_ich(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_ich(struct pci_dev *dev)
{ {
u32 extra = 0; u32 extra = 0;
......
drivers/ide/pci/serverworks.c
View file @ a326b02b
...@@ -174,7 +174,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed) ...@@ -174,7 +174,7 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
pci_write_config_byte(dev, 0x54, ultra_enable); pci_write_config_byte(dev, 0x54, ultra_enable);
} }
static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev)
{ {
unsigned int reg; unsigned int reg;
u8 btr; u8 btr;
...@@ -190,8 +190,8 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha ...@@ -190,8 +190,8 @@ static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const cha
pci_read_config_dword(isa_dev, 0x64, &reg); pci_read_config_dword(isa_dev, 0x64, &reg);
reg &= ~0x00002000; /* disable 600ns interrupt mask */ reg &= ~0x00002000; /* disable 600ns interrupt mask */
if(!(reg & 0x00004000)) if(!(reg & 0x00004000))
printk(KERN_DEBUG "%s %s: UDMA not BIOS " printk(KERN_DEBUG DRV_NAME " %s: UDMA not BIOS "
"enabled.\n", name, pci_name(dev)); "enabled.\n", pci_name(dev));
reg |= 0x00004000; /* enable UDMA/33 support */ reg |= 0x00004000; /* enable UDMA/33 support */
pci_write_config_dword(isa_dev, 0x64, reg); pci_write_config_dword(isa_dev, 0x64, reg);
} }
......
drivers/ide/pci/siimage.c
View file @ a326b02b
...@@ -457,14 +457,12 @@ static void sil_sata_pre_reset(ide_drive_t *drive) ...@@ -457,14 +457,12 @@ static void sil_sata_pre_reset(ide_drive_t *drive)
/** /**
* init_chipset_siimage - set up an SI device * init_chipset_siimage - set up an SI device
* @dev: PCI device * @dev: PCI device
* @name: device name
* *
* Perform the initial PCI set up for this device. Attempt to switch * Perform the initial PCI set up for this device. Attempt to switch
* to 133 MHz clocking if the system isn't already set up to do it. * to 133 MHz clocking if the system isn't already set up to do it.
*/ */
static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev, static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev)
const char *name)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
void __iomem *ioaddr = host->host_priv; void __iomem *ioaddr = host->host_priv;
...@@ -541,8 +539,8 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev, ...@@ -541,8 +539,8 @@ static unsigned int __devinit init_chipset_siimage(struct pci_dev *dev,
{ "== 100", "== 133", "== 2X PCI", "DISABLED!" }; { "== 100", "== 133", "== 2X PCI", "DISABLED!" };
tmp >>= 4; tmp >>= 4;
printk(KERN_INFO "%s %s: BASE CLOCK %s\n", printk(KERN_INFO DRV_NAME " %s: BASE CLOCK %s\n",
name, pci_name(dev), clk_str[tmp & 3]); pci_name(dev), clk_str[tmp & 3]);
} }
return 0; return 0;
......
drivers/ide/pci/sis5513.c
View file @ a326b02b
...@@ -448,8 +448,7 @@ static int __devinit sis_find_family(struct pci_dev *dev) ...@@ -448,8 +448,7 @@ static int __devinit sis_find_family(struct pci_dev *dev)
return chipset_family; return chipset_family;
} }
static unsigned int __devinit init_chipset_sis5513(struct pci_dev *dev, static unsigned int __devinit init_chipset_sis5513(struct pci_dev *dev)
const char *name)
{ {
/* Make general config ops here /* Make general config ops here
1/ tell IDE channels to operate in Compatibility mode only 1/ tell IDE channels to operate in Compatibility mode only
......
drivers/ide/pci/sl82c105.c
View file @ a326b02b
...@@ -272,7 +272,7 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev) ...@@ -272,7 +272,7 @@ static u8 sl82c105_bridge_revision(struct pci_dev *dev)
* channel 0 here at least, but channel 1 has to be enabled by * channel 0 here at least, but channel 1 has to be enabled by
* firmware or arch code. We still set both to 16 bits mode. * firmware or arch code. We still set both to 16 bits mode.
*/ */
static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev, const char *msg) static unsigned int __devinit init_chipset_sl82c105(struct pci_dev *dev)
{ {
u32 val; u32 val;
......
drivers/ide/pci/via82cxxx.c
View file @ a326b02b
...@@ -262,13 +262,12 @@ static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u) ...@@ -262,13 +262,12 @@ static void __devinit via_cable_detect(struct via82cxxx_dev *vdev, u32 u)
/** /**
* init_chipset_via82cxxx - initialization handler * init_chipset_via82cxxx - initialization handler
* @dev: PCI device * @dev: PCI device
* @name: Name of interface
* *
* The initialization callback. Here we determine the IDE chip type * The initialization callback. Here we determine the IDE chip type
* and initialize its drive independent registers. * and initialize its drive independent registers.
*/ */
static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev, const char *name) static unsigned int __devinit init_chipset_via82cxxx(struct pci_dev *dev)
{ {
struct ide_host *host = pci_get_drvdata(dev); struct ide_host *host = pci_get_drvdata(dev);
struct via82cxxx_dev *vdev = host->host_priv; struct via82cxxx_dev *vdev = host->host_priv;
......
drivers/ide/setup-pci.c
View file @ a326b02b
...@@ -515,7 +515,7 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, ...@@ -515,7 +515,7 @@ static int do_ide_setup_pci_device(struct pci_dev *dev,
* space, place chipset into init-mode, and/or preserve * space, place chipset into init-mode, and/or preserve
* an interrupt if the card is not native ide support. * an interrupt if the card is not native ide support.
*/ */
ret = d->init_chipset ? d->init_chipset(dev, d->name) : 0; ret = d->init_chipset ? d->init_chipset(dev) : 0;
if (ret < 0) if (ret < 0)
goto out; goto out;
......
include/linux/ide.h
View file @ a326b02b
...@@ -1206,7 +1206,7 @@ enum { ...@@ -1206,7 +1206,7 @@ enum {
struct ide_port_info { struct ide_port_info {
char *name; char *name;
unsigned int (*init_chipset)(struct pci_dev *, const char *); unsigned int (*init_chipset)(struct pci_dev *);
void (*init_iops)(ide_hwif_t *); void (*init_iops)(ide_hwif_t *);
void (*init_hwif)(ide_hwif_t *); void (*init_hwif)(ide_hwif_t *);
int (*init_dma)(ide_hwif_t *, int (*init_dma)(ide_hwif_t *,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7