tifm __iomem annotations, NULL noise removal
PATCH 1/1 tifm __iomem annotations, NULL noise removal
Signed-off-by Al Viro <[email protected]>
--- drivers/misc/tifm_7xx1.c | 13 +++++++------ drivers/misc/tifm_core.c | 2 +- drivers/mmc/tifm_sd.c | 14 +++++++------- 3 files changed, 15 insertions(+), 14 deletions(-)
drivers/misc/tifm_7xx1.c +7 -6
@@ -48,7 +48,7 @@ static void tifm_7xx1_remove_media(void printk(KERN_INFO DRIVER_NAME ": demand removing card from socket %d\n", cnt); sock = fm->sockets[cnt]; - fm->sockets[cnt] =0 ; + fm->sockets[cnt] =NULL ; fm->remove_mask &= ~(1 << cnt);writel (0x0e00 , sock->addr +SOCK_CONTROL );
@@ -118,7 +118,7 @@ static irqreturn_t tifm_7xx1_isr(int irqreturn IRQ_HANDLED ; } -static tifm_media_id tifm_7xx1_toggle_sock_power (char *sock_addr,int is_x2) +static tifm_media_id tifm_7xx1_toggle_sock_power (char __iomem *sock_addr,int is_x2) {unsigned int s_state;int cnt;
@@ -163,7 +163,8 @@ static tifm_media_id tifm_7xx1_toggle_soreturn (readl (sock_addr +SOCK_PRESENT_STATE ) >>4 ) &7 ; } -inline static char *tifm_7xx1_sock_addr (char *base_addr,unsigned int sock_num) +inline static char __iomem * +tifm_7xx1_sock_addr (char __iomem *base_addr,unsigned int sock_num) {return base_addr + ((sock_num +1 ) <<10 ); }
@@ -176,7 +177,7 @@ static void tifm_7xx1_insert_media(voidchar *card_name ="xx" ;int cnt, ok_to_register;unsigned int insert_mask; -struct tifm_dev *new_sock =0 ; +struct tifm_dev *new_sock =NULL ;if (!class_device_get (&fm->cdev))return ;
@@ -230,7 +231,7 @@ static void tifm_7xx1_insert_media(voidif (!ok_to_register ||device_register (&new_sock->dev)) {spin_lock_irqsave (&fm->lock, flags); - fm->sockets[cnt] =0 ; + fm->sockets[cnt] =NULL ;spin_unlock_irqrestore (&fm->lock, flags);tifm_free_device (&new_sock->dev);
@@ -390,7 +391,7 @@ static void tifm_7xx1_remove(struct pci_tifm_remove_adapter (fm); -pci_set_drvdata (dev,0 ); +pci_set_drvdata (dev,NULL );iounmap (fm->addr);pci_intx (dev,0 );
drivers/misc/tifm_core.c +1 -1
@@ -157,7 +157,7 @@ struct tifm_dev *tifm_alloc_device(struc dev->wq =create_singlethread_workqueue (dev->wq_name);if (!dev->wq) {kfree (dev); -return 0 ; +return NULL ; } dev->dev.parent = fm->dev; dev->dev.bus = &tifm_bus_type;
drivers/mmc/tifm_sd.c +7 -7
@@ -501,13 +501,13 @@ static void tifm_sd_end_cmd(void *data)struct tifm_dev *sock = host->dev;struct mmc_host *mmc =tifm_get_drvdata (sock);struct mmc_request *mrq; -struct mmc_data *r_data =0 ; +struct mmc_data *r_data =NULL ;unsigned long flags;spin_lock_irqsave (&sock->lock, flags); mrq = host->req; - host->req =0 ; + host->req =NULL ; host->state =IDLE ;if (!mrq) {
@@ -546,7 +546,7 @@ static void tifm_sd_request_nodma(structstruct tifm_dev *sock = host->dev;unsigned long flags;struct mmc_data *r_data = mrq->cmd->data; -char *t_buffer =0 ; +char *t_buffer =NULL ;if (r_data) { t_buffer =kmap (r_data->sg->page);
@@ -613,13 +613,13 @@ static void tifm_sd_end_cmd_nodma(void *struct tifm_dev *sock = host->dev;struct mmc_host *mmc =tifm_get_drvdata (sock);struct mmc_request *mrq; -struct mmc_data *r_data =0 ; +struct mmc_data *r_data =NULL ;unsigned long flags;spin_lock_irqsave (&sock->lock, flags); mrq = host->req; - host->req =0 ; + host->req =NULL ; host->state =IDLE ;if (!mrq) {
@@ -644,7 +644,7 @@ static void tifm_sd_end_cmd_nodma(void * r_data->bytes_xfered += r_data->blksz -readl (sock->addr +SOCK_MMCSD_BLOCK_LEN ) +1 ; } - host->buffer =0 ; + host->buffer =NULL ; host->buffer_pos =0 ; host->buffer_size =0 ; }
@@ -895,7 +895,7 @@ static void tifm_sd_remove(struct tifm_d sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);writel (0 , sock->addr +SOCK_DMA_FIFO_INT_ENABLE_SET ); -tifm_set_drvdata (sock,0 ); +tifm_set_drvdata (sock,NULL );mmc_free_host (mmc); }
Signature · 1 line
1.4.2.GIT