Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: ddbridge: fix sparse warnings

Fix several

drivers/media/pci/ddbridge/ddbridge-core.c: warning: symbol ... was not declared. Should it be static?
drivers/media/pci/ddbridge/ddbridge-core.c: warning: Using plain integer as NULL pointer
drivers/media/pci/ddbridge/ddbridge-io.h: warning: cast removes address space of expression
drivers/media/pci/ddbridge/ddbridge-io.h: warning: incorrect type in argument 1 (different address spaces)

at multiple places.

Cc: Ralph Metzler <rjkm@metzlerbros.de>
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

authored by

Daniel Scheller and committed by
Mauro Carvalho Chehab
b5967860 1502efd2

+19 -19
+13 -13
drivers/media/pci/ddbridge/ddbridge-core.c
··· 69 69 70 70 /****************************************************************************/ 71 71 72 - DEFINE_MUTEX(redirect_lock); 72 + static DEFINE_MUTEX(redirect_lock); 73 73 74 74 struct workqueue_struct *ddb_wq; 75 75 ··· 135 135 136 136 static int ddb_unredirect(struct ddb_port *port) 137 137 { 138 - struct ddb_input *oredi, *iredi = 0; 139 - struct ddb_output *iredo = 0; 138 + struct ddb_input *oredi, *iredi = NULL; 139 + struct ddb_output *iredo = NULL; 140 140 141 141 /* dev_info(port->dev->dev, 142 142 * "unredirect %d.%d\n", port->dev->nr, port->nr); ··· 160 160 ddb_redirect_dma(oredi->port->dev, 161 161 oredi->dma, iredo->dma); 162 162 } 163 - port->input[0]->redo = 0; 163 + port->input[0]->redo = NULL; 164 164 ddb_set_dma_table(port->input[0]); 165 165 } 166 166 oredi->redi = iredi; 167 - port->input[0]->redi = 0; 167 + port->input[0]->redi = NULL; 168 168 } 169 - oredi->redo = 0; 170 - port->output->redi = 0; 169 + oredi->redo = NULL; 170 + port->output->redi = NULL; 171 171 172 172 ddb_set_dma_table(oredi); 173 173 done: ··· 209 209 if (input2) { 210 210 if (input->redi) { 211 211 input2->redi = input->redi; 212 - input->redi = 0; 212 + input->redi = NULL; 213 213 } else 214 214 input2->redi = input; 215 215 } ··· 811 811 .open = ts_open, 812 812 .release = ts_release, 813 813 .poll = ts_poll, 814 - .mmap = 0, 814 + .mmap = NULL, 815 815 }; 816 816 817 817 static struct dvb_device dvbdev_ci = { 818 - .priv = 0, 818 + .priv = NULL, 819 819 .readers = 1, 820 820 .writers = 1, 821 821 .users = 2, ··· 2053 2053 2054 2054 static void ci_attach(struct ddb_port *port) 2055 2055 { 2056 - struct ddb_ci *ci = 0; 2056 + struct ddb_ci *ci = NULL; 2057 2057 2058 2058 ci = kzalloc(sizeof(*ci), GFP_KERNEL); 2059 2059 if (!ci) ··· 2206 2206 /****************************************************************************/ 2207 2207 /****************************************************************************/ 2208 2208 2209 - struct cxd2099_cfg cxd_cfg = { 2209 + static struct cxd2099_cfg cxd_cfg = { 2210 2210 .bitrate = 72000, 2211 2211 .adr = 0x40, 2212 2212 .polarity = 1, ··· 3445 3445 if (res) { 3446 3446 ddb_device_attrs_del(dev); 3447 3447 device_destroy(&ddb_class, MKDEV(ddb_major, dev->nr)); 3448 - ddbs[dev->nr] = 0; 3448 + ddbs[dev->nr] = NULL; 3449 3449 dev->ddb_dev = ERR_PTR(-ENODEV); 3450 3450 } else 3451 3451 ddb_num++;
+6 -6
drivers/media/pci/ddbridge/ddbridge-io.h
··· 27 27 28 28 static inline u32 ddblreadl(struct ddb_link *link, u32 adr) 29 29 { 30 - return readl((char *) (link->dev->regs + (adr))); 30 + return readl(link->dev->regs + adr); 31 31 } 32 32 33 33 static inline void ddblwritel(struct ddb_link *link, u32 val, u32 adr) 34 34 { 35 - writel(val, (char *) (link->dev->regs + (adr))); 35 + writel(val, link->dev->regs + adr); 36 36 } 37 37 38 38 static inline u32 ddbreadl(struct ddb *dev, u32 adr) 39 39 { 40 - return readl((char *) (dev->regs + (adr))); 40 + return readl(dev->regs + adr); 41 41 } 42 42 43 43 static inline void ddbwritel(struct ddb *dev, u32 val, u32 adr) 44 44 { 45 - writel(val, (char *) (dev->regs + (adr))); 45 + writel(val, dev->regs + adr); 46 46 } 47 47 48 48 static inline void ddbcpyto(struct ddb *dev, u32 adr, void *src, long count) 49 49 { 50 - return memcpy_toio((char *) (dev->regs + adr), src, count); 50 + return memcpy_toio(dev->regs + adr, src, count); 51 51 } 52 52 53 53 static inline void ddbcpyfrom(struct ddb *dev, void *dst, u32 adr, long count) 54 54 { 55 - return memcpy_fromio(dst, (char *) (dev->regs + adr), count); 55 + return memcpy_fromio(dst, dev->regs + adr, count); 56 56 } 57 57 58 58 static inline u32 safe_ddbreadl(struct ddb *dev, u32 adr)