Commit a534ff3f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bjorn Helgaas
Browse files

scsi: message: fusion: Remove unused mpt_pci driver .probe() 'id' parameter 

The only two drivers don't make use of the id parameter, so drop it.  This
is a step toward removing pci_dev->driver.

Link: https://lore.kernel.org/r/20211004125935.2300113-9-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 171d149c

drivers/message/fusion/mptbase.c

+2 −5
Original line number Diff line number Diff line
@@ -829,7 +829,6 @@ int 
mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx)

{

	MPT_ADAPTER	*ioc;

	const struct pci_device_id *id;



	if (!cb_idx || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS)

		return -EINVAL;
@@ -838,10 +837,8 @@ mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, u8 cb_idx) 


	/* call per pci device probe entry point */

	list_for_each_entry(ioc, &ioc_list, list) {

		id = ioc->pcidev->driver ?

		    ioc->pcidev->driver->id_table : NULL;

		if (dd_cbfunc->probe)

			dd_cbfunc->probe(ioc->pcidev, id);

			dd_cbfunc->probe(ioc->pcidev);

	 }



	return 0;
@@ -2032,7 +2029,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
	for(cb_idx = 0; cb_idx < MPT_MAX_PROTOCOL_DRIVERS; cb_idx++) {

		if(MptDeviceDriverHandlers[cb_idx] &&

		  MptDeviceDriverHandlers[cb_idx]->probe) {

			MptDeviceDriverHandlers[cb_idx]->probe(pdev,id);

			MptDeviceDriverHandlers[cb_idx]->probe(pdev);

		}

	}

drivers/message/fusion/mptbase.h

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ typedef enum { 
} MPT_DRIVER_CLASS;



struct mpt_pci_driver{

	int  (*probe) (struct pci_dev *dev, const struct pci_device_id *id);

	int  (*probe) (struct pci_dev *dev);

	void (*remove) (struct pci_dev *dev);

};

drivers/message/fusion/mptctl.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int mptctl_do_reset(MPT_ADAPTER *iocp, unsigned long arg); 
static int mptctl_hp_hostinfo(MPT_ADAPTER *iocp, unsigned long arg, unsigned int cmd);

static int mptctl_hp_targetinfo(MPT_ADAPTER *iocp, unsigned long arg);



static int  mptctl_probe(struct pci_dev *, const struct pci_device_id *);

static int  mptctl_probe(struct pci_dev *);

static void mptctl_remove(struct pci_dev *);



#ifdef CONFIG_COMPAT
@@ -2838,7 +2838,7 @@ static long compat_mpctl_ioctl(struct file *f, unsigned int cmd, unsigned long a 
 */



static int

mptctl_probe(struct pci_dev *pdev, const struct pci_device_id *id)

mptctl_probe(struct pci_dev *pdev)

{

	MPT_ADAPTER *ioc = pci_get_drvdata(pdev);

drivers/message/fusion/mptlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum) 
}



static int

mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)

mptlan_probe(struct pci_dev *pdev)

{

	MPT_ADAPTER 		*ioc = pci_get_drvdata(pdev);

	struct net_device	*dev;