[PATCH 00/11] Remove unnecessary casts of pci_get_drvdata

[PATCH 00/11] Remove unnecessary casts of pci_get_drvdata

[Joe Perches]

Joe Perches (11):
  drivers/i2c/busses/i2c-nforce2.c: Remove unnecessary casts of pci_get_drvdata
  drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
  drivers/media/dvb/ngene/ngene-core.c: Remove unnecessary casts of pci_get_drvdata
  drivers/misc/ibmasm/module.c: Remove unnecessary casts of pci_get_drvdata
  drivers/net/irda: Remove unnecessary casts of pci_get_drvdata
  drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata
  drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata
  drivers/scsi/be2iscsi/be_main.c: Remove unnecessary casts of pci_get_drvdata
  drivers/staging: Remove unnecessary casts of pci_get_drvdata
  drivers/usb/host/uhci-hcd.c: Remove unnecessary casts of pci_get_drvdata
  sound/pci/asihpi/hpioctl.c: Remove unnecessary casts of pci_get_drvdata

 drivers/i2c/busses/i2c-nforce2.c          |    2 +-
 drivers/ide/pmac.c                        |    4 ++--
 drivers/media/dvb/ngene/ngene-core.c      |    2 +-
 drivers/misc/ibmasm/module.c              |    2 +-
 drivers/net/irda/donauboe.c               |    6 +++---
 drivers/net/irda/vlsi_ir.c                |    2 +-
 drivers/net/s2io.c                        |    3 +--
 drivers/net/vxge/vxge-main.c              |   28 ++++++++++++----------------
 drivers/scsi/be2iscsi/be_main.c           |    2 +-
 drivers/staging/crystalhd/crystalhd_lnx.c |    6 +++---
 drivers/staging/et131x/et131x_initpci.c   |    2 +-
 drivers/staging/wlags49_h2/wl_pci.c       |    2 +-
 drivers/usb/host/uhci-hcd.c               |    2 +-
 sound/pci/asihpi/hpioctl.c                |    2 +-
 14 files changed, 30 insertions(+), 35 deletions(-)

-- 
1.7.3.1.g432b3.dirty

[PATCH 05/11] drivers/net/irda: Remove unnecessary casts of pci_get_drvdata

[Joe Perches]

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/irda/donauboe.c |    6 +++---
 drivers/net/irda/vlsi_ir.c  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index b626ccc..bee5ccc 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1488,7 +1488,7 @@ static void
 toshoboe_close (struct pci_dev *pci_dev)
 {
   int i;
-  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
+  struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
 
   IRDA_DEBUG (4, "%s()\n", __func__);
 
@@ -1698,7 +1698,7 @@ freeself:
 static int
 toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)
 {
-  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
+  struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
   unsigned long flags;
   int i = 10;
 
@@ -1727,7 +1727,7 @@ toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)
 static int
 toshoboe_wakeup (struct pci_dev *pci_dev)
 {
-  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
+  struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
   unsigned long flags;
 
   IRDA_DEBUG (4, "%s()\n", __func__);
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index c3d0738..62f2d12 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -542,7 +542,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)
 	int		crclen, len = 0;
 	struct sk_buff	*skb;
 	int		ret = 0;
-	struct net_device *ndev = (struct net_device *)pci_get_drvdata(r->pdev);
+	struct net_device *ndev = pci_get_drvdata(r->pdev);
 	vlsi_irda_dev_t *idev = netdev_priv(ndev);
 
 	pci_dma_sync_single_for_cpu(r->pdev, rd_get_addr(rd), r->len, r->dir);
-- 
1.7.3.1.g432b3.dirty

Re: [PATCH 05/11] drivers/net/irda: Remove unnecessary casts of pci_get_drvdata

[Samuel Ortiz]

Hi Joe,

On Mon, 2010-11-15 at 12:13 -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <joe@perches.com>
Thanks, I'll apply it to my irda tree.

Cheers,
Samuel.


> ---
>  drivers/net/irda/donauboe.c |    6 +++---
>  drivers/net/irda/vlsi_ir.c  |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
> index b626ccc..bee5ccc 100644
> --- a/drivers/net/irda/donauboe.c
> +++ b/drivers/net/irda/donauboe.c
> @@ -1488,7 +1488,7 @@ static void
>  toshoboe_close (struct pci_dev *pci_dev)
>  {
>    int i;
> -  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
> +  struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
>  
>    IRDA_DEBUG (4, "%s()\n", __func__);
>  
> @@ -1698,7 +1698,7 @@ freeself:
>  static int
>  toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)
>  {
> -  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
> +  struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
>    unsigned long flags;
>    int i = 10;
>  
> @@ -1727,7 +1727,7 @@ toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap)
>  static int
>  toshoboe_wakeup (struct pci_dev *pci_dev)
>  {
> -  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);
> +  struct toshoboe_cb *self = pci_get_drvdata(pci_dev);
>    unsigned long flags;
>  
>    IRDA_DEBUG (4, "%s()\n", __func__);
> diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
> index c3d0738..62f2d12 100644
> --- a/drivers/net/irda/vlsi_ir.c
> +++ b/drivers/net/irda/vlsi_ir.c
> @@ -542,7 +542,7 @@ static int vlsi_process_rx(struct vlsi_ring *r, struct ring_descr *rd)
>  	int		crclen, len = 0;
>  	struct sk_buff	*skb;
>  	int		ret = 0;
> -	struct net_device *ndev = (struct net_device *)pci_get_drvdata(r->pdev);
> +	struct net_device *ndev = pci_get_drvdata(r->pdev);
>  	vlsi_irda_dev_t *idev = netdev_priv(ndev);
>  
>  	pci_dma_sync_single_for_cpu(r->pdev, rd_get_addr(rd), r->len, r->dir);

[PATCH 06/11] drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata

[Joe Perches]

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/s2io.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index ecc25aa..0f4219c 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -8321,8 +8321,7 @@ mem_alloc_failed:
 
 static void __devexit s2io_rem_nic(struct pci_dev *pdev)
 {
-	struct net_device *dev =
-		(struct net_device *)pci_get_drvdata(pdev);
+	struct net_device *dev = pci_get_drvdata(pdev);
 	struct s2io_nic *sp;
 
 	if (dev == NULL) {
-- 
1.7.3.1.g432b3.dirty

Re: [PATCH 06/11] drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata

[David Miller]

From: Joe Perches <joe@perches.com>
Date: Mon, 15 Nov 2010 12:13:57 -0800

> Signed-off-by: Joe Perches <joe@perches.com>

Applied.

[PATCH 07/11] drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata

[Joe Perches]

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/net/vxge/vxge-main.c |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 3f2d6ed..22c7d79 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -688,7 +688,7 @@ static int vxge_learn_mac(struct vxgedev *vdev, u8 *mac_header)
 	struct vxge_vpath *vpath = NULL;
 	struct __vxge_hw_device *hldev;
 
-	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 
 	mac_address = (u8 *)&mac_addr;
 	memcpy(mac_address, mac_header, ETH_ALEN);
@@ -1313,7 +1313,7 @@ static void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
 	struct __vxge_hw_device *hldev;
 	int msix_id;
 
-	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 
 	vxge_hw_vpath_wait_receive_idle(hldev, vpath->device_id);
 
@@ -1632,8 +1632,7 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
 	int budget_org = budget;
 	struct vxge_ring *ring;
 
-	struct __vxge_hw_device *hldev = (struct __vxge_hw_device *)
-		pci_get_drvdata(vdev->pdev);
+	struct __vxge_hw_device *hldev = pci_get_drvdata(vdev->pdev);
 
 	for (i = 0; i < vdev->no_of_vpath; i++) {
 		ring = &vdev->vpaths[i].ring;
@@ -1673,7 +1672,7 @@ static void vxge_netpoll(struct net_device *dev)
 	struct vxgedev *vdev;
 
 	vdev = (struct vxgedev *)netdev_priv(dev);
-	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 
 	vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
 
@@ -2107,7 +2106,7 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
 	vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__);
 
 	dev = vdev->ndev;
-	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 
 	if (pci_channel_offline(vdev->pdev))
 		return IRQ_NONE;
@@ -2342,7 +2341,7 @@ static void vxge_rem_msix_isr(struct vxgedev *vdev)
 static void vxge_rem_isr(struct vxgedev *vdev)
 {
 	struct __vxge_hw_device *hldev;
-	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 
 #ifdef CONFIG_PCI_MSI
 	if (vdev->config.intr_type == MSI_X) {
@@ -2583,7 +2582,7 @@ vxge_open(struct net_device *dev)
 		"%s: %s:%d", dev->name, __func__, __LINE__);
 
 	vdev = (struct vxgedev *)netdev_priv(dev);
-	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 	function_mode = vdev->config.device_hw_info.function_mode;
 
 	/* make sure you have link off by default every time Nic is
@@ -2811,7 +2810,7 @@ static int do_vxge_close(struct net_device *dev, int do_io)
 		dev->name, __func__, __LINE__);
 
 	vdev = (struct vxgedev *)netdev_priv(dev);
-	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
+	hldev = pci_get_drvdata(vdev->pdev);
 
 	if (unlikely(!is_vxge_card_up(vdev)))
 		return 0;
@@ -3985,8 +3984,7 @@ static int vxge_pm_resume(struct pci_dev *pdev)
 static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
 						pci_channel_state_t state)
 {
-	struct __vxge_hw_device *hldev =
-		(struct __vxge_hw_device  *)pci_get_drvdata(pdev);
+	struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
 	struct net_device *netdev = hldev->ndev;
 
 	netif_device_detach(netdev);
@@ -4015,8 +4013,7 @@ static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
  */
 static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
 {
-	struct __vxge_hw_device *hldev =
-		(struct __vxge_hw_device  *)pci_get_drvdata(pdev);
+	struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
 	struct net_device *netdev = hldev->ndev;
 
 	struct vxgedev *vdev = netdev_priv(netdev);
@@ -4041,8 +4038,7 @@ static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
  */
 static void vxge_io_resume(struct pci_dev *pdev)
 {
-	struct __vxge_hw_device *hldev =
-		(struct __vxge_hw_device  *)pci_get_drvdata(pdev);
+	struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
 	struct net_device *netdev = hldev->ndev;
 
 	if (netif_running(netdev)) {
@@ -4689,7 +4685,7 @@ static void __devexit vxge_remove(struct pci_dev *pdev)
 	struct net_device *dev;
 	int i = 0;
 
-	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(pdev);
+	hldev = pci_get_drvdata(pdev);
 
 	if (hldev == NULL)
 		return;
-- 
1.7.3.1.g432b3.dirty

Re: [PATCH 07/11] drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata

[Jon Mason]

On Mon, Nov 15, 2010 at 12:13:58PM -0800, Joe Perches wrote:
> Signed-off-by: Joe Perches <joe@perches.com>

Looks good to me.

Acked-by: Jon Mason <jon.mason@exar.com>
> ---
>  drivers/net/vxge/vxge-main.c |   28 ++++++++++++----------------
>  1 files changed, 12 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
> index 3f2d6ed..22c7d79 100644
> --- a/drivers/net/vxge/vxge-main.c
> +++ b/drivers/net/vxge/vxge-main.c
> @@ -688,7 +688,7 @@ static int vxge_learn_mac(struct vxgedev *vdev, u8 *mac_header)
>  	struct vxge_vpath *vpath = NULL;
>  	struct __vxge_hw_device *hldev;
>  
> -	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  
>  	mac_address = (u8 *)&mac_addr;
>  	memcpy(mac_address, mac_header, ETH_ALEN);
> @@ -1313,7 +1313,7 @@ static void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
>  	struct __vxge_hw_device *hldev;
>  	int msix_id;
>  
> -	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  
>  	vxge_hw_vpath_wait_receive_idle(hldev, vpath->device_id);
>  
> @@ -1632,8 +1632,7 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
>  	int budget_org = budget;
>  	struct vxge_ring *ring;
>  
> -	struct __vxge_hw_device *hldev = (struct __vxge_hw_device *)
> -		pci_get_drvdata(vdev->pdev);
> +	struct __vxge_hw_device *hldev = pci_get_drvdata(vdev->pdev);
>  
>  	for (i = 0; i < vdev->no_of_vpath; i++) {
>  		ring = &vdev->vpaths[i].ring;
> @@ -1673,7 +1672,7 @@ static void vxge_netpoll(struct net_device *dev)
>  	struct vxgedev *vdev;
>  
>  	vdev = (struct vxgedev *)netdev_priv(dev);
> -	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  
>  	vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
>  
> @@ -2107,7 +2106,7 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
>  	vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__);
>  
>  	dev = vdev->ndev;
> -	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  
>  	if (pci_channel_offline(vdev->pdev))
>  		return IRQ_NONE;
> @@ -2342,7 +2341,7 @@ static void vxge_rem_msix_isr(struct vxgedev *vdev)
>  static void vxge_rem_isr(struct vxgedev *vdev)
>  {
>  	struct __vxge_hw_device *hldev;
> -	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  
>  #ifdef CONFIG_PCI_MSI
>  	if (vdev->config.intr_type == MSI_X) {
> @@ -2583,7 +2582,7 @@ vxge_open(struct net_device *dev)
>  		"%s: %s:%d", dev->name, __func__, __LINE__);
>  
>  	vdev = (struct vxgedev *)netdev_priv(dev);
> -	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  	function_mode = vdev->config.device_hw_info.function_mode;
>  
>  	/* make sure you have link off by default every time Nic is
> @@ -2811,7 +2810,7 @@ static int do_vxge_close(struct net_device *dev, int do_io)
>  		dev->name, __func__, __LINE__);
>  
>  	vdev = (struct vxgedev *)netdev_priv(dev);
> -	hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev);
> +	hldev = pci_get_drvdata(vdev->pdev);
>  
>  	if (unlikely(!is_vxge_card_up(vdev)))
>  		return 0;
> @@ -3985,8 +3984,7 @@ static int vxge_pm_resume(struct pci_dev *pdev)
>  static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
>  						pci_channel_state_t state)
>  {
> -	struct __vxge_hw_device *hldev =
> -		(struct __vxge_hw_device  *)pci_get_drvdata(pdev);
> +	struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
>  	struct net_device *netdev = hldev->ndev;
>  
>  	netif_device_detach(netdev);
> @@ -4015,8 +4013,7 @@ static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
>   */
>  static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
>  {
> -	struct __vxge_hw_device *hldev =
> -		(struct __vxge_hw_device  *)pci_get_drvdata(pdev);
> +	struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
>  	struct net_device *netdev = hldev->ndev;
>  
>  	struct vxgedev *vdev = netdev_priv(netdev);
> @@ -4041,8 +4038,7 @@ static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
>   */
>  static void vxge_io_resume(struct pci_dev *pdev)
>  {
> -	struct __vxge_hw_device *hldev =
> -		(struct __vxge_hw_device  *)pci_get_drvdata(pdev);
> +	struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
>  	struct net_device *netdev = hldev->ndev;
>  
>  	if (netif_running(netdev)) {
> @@ -4689,7 +4685,7 @@ static void __devexit vxge_remove(struct pci_dev *pdev)
>  	struct net_device *dev;
>  	int i = 0;
>  
> -	hldev = (struct __vxge_hw_device  *)pci_get_drvdata(pdev);
> +	hldev = pci_get_drvdata(pdev);
>  
>  	if (hldev == NULL)
>  		return;
> -- 
> 1.7.3.1.g432b3.dirty
> 

Re: [PATCH 07/11] drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata

[David Miller]

From: Jon Mason <jon.mason@exar.com>
Date: Mon, 15 Nov 2010 16:50:56 -0600

> On Mon, Nov 15, 2010 at 12:13:58PM -0800, Joe Perches wrote:
>> Signed-off-by: Joe Perches <joe@perches.com>
> 
> Looks good to me.
> 
> Acked-by: Jon Mason <jon.mason@exar.com>

Applied.