Commit 06a0e05b authored by Linus Torvalds's avatar Linus Torvalds

Manual merge of duplicate warning fixes

parents 1780a902 20f1479d
...@@ -89,6 +89,11 @@ CONFIG_DISPLAY7SEG=m ...@@ -89,6 +89,11 @@ CONFIG_DISPLAY7SEG=m
CONFIG_WATCHDOG_CP1XXX=m CONFIG_WATCHDOG_CP1XXX=m
CONFIG_WATCHDOG_RIO=m CONFIG_WATCHDOG_RIO=m
#
# Generic Driver Options
#
CONFIG_FW_LOADER=m
# #
# Graphics support # Graphics support
# #
...@@ -266,39 +271,72 @@ CONFIG_BLK_DEV_IDE_MODES=y ...@@ -266,39 +271,72 @@ CONFIG_BLK_DEV_IDE_MODES=y
CONFIG_SCSI=y CONFIG_SCSI=y
# #
# SCSI support type (disk, tape, CDrom) # SCSI support type (disk, tape, CD-ROM)
# #
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SD_EXTRA_DEVS=40
CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_ST=m
CONFIG_CHR_DEV_OSST=m CONFIG_CHR_DEV_OSST=m
CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR=m
CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_SR_EXTRA_DEVS=2
CONFIG_CHR_DEV_SG=m CONFIG_CHR_DEV_SG=m
# #
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
# #
CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_REPORT_LUNS=y
CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_CONSTANTS=y
# CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_LOGGING is not set
# #
# SCSI low-level drivers # SCSI low-level drivers
# #
CONFIG_SCSI_SUNESP=y CONFIG_BLK_DEV_3W_XXXX_RAID=m
CONFIG_SCSI_QLOGICPTI=m CONFIG_SCSI_ACARD=m
CONFIG_SCSI_AACRAID=m
# CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC7XXX_OLD is not set
CONFIG_SCSI_AIC79XX=m
CONFIG_AIC79XX_CMDS_PER_DEVICE=32
CONFIG_AIC79XX_RESET_DELAY_MS=15000
# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
# CONFIG_AIC79XX_DEBUG_ENABLE is not set
CONFIG_AIC79XX_DEBUG_MASK=0
# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
# CONFIG_SCSI_MEGARAID is not set
# CONFIG_SCSI_BUSLOGIC is not set
# CONFIG_SCSI_CPQFCTS is not set
CONFIG_SCSI_DMX3191D=m
# CONFIG_SCSI_EATA is not set
CONFIG_SCSI_EATA_PIO=m
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
# CONFIG_SCSI_INITIO is not set
CONFIG_SCSI_INIA100=m
CONFIG_SCSI_PPA=m
CONFIG_SCSI_IMM=m
# CONFIG_SCSI_IZIP_EPP16 is not set
# CONFIG_SCSI_IZIP_SLOW_CTR is not set
CONFIG_SCSI_SYM53C8XX_2=y CONFIG_SCSI_SYM53C8XX_2=y
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
# CONFIG_SCSI_PCI2000 is not set
# CONFIG_SCSI_PCI2220I is not set
CONFIG_SCSI_QLOGIC_ISP=m CONFIG_SCSI_QLOGIC_ISP=m
CONFIG_SCSI_QLOGIC_FC=y CONFIG_SCSI_QLOGIC_FC=y
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
# CONFIG_SCSI_QLOGIC_1280 is not set
CONFIG_SCSI_QLOGICPTI=m
CONFIG_SCSI_DC395x=m
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_NSP32 is not set
CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_SUNESP=y
# #
# Fibre Channel support # Fibre Channel support
...@@ -966,17 +1004,19 @@ CONFIG_RAMFS=y ...@@ -966,17 +1004,19 @@ CONFIG_RAMFS=y
# #
# Miscellaneous filesystems # Miscellaneous filesystems
# #
# CONFIG_ADFS_FS is not set CONFIG_ADFS_FS=m
# CONFIG_ADFS_FS_RW is not set
CONFIG_AFFS_FS=m CONFIG_AFFS_FS=m
# CONFIG_HFS_FS is not set CONFIG_HFS_FS=m
CONFIG_BEFS_FS=m CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set # CONFIG_BEFS_DEBUG is not set
CONFIG_BFS_FS=m CONFIG_BFS_FS=m
CONFIG_EFS_FS=m CONFIG_EFS_FS=m
# CONFIG_CRAMFS is not set CONFIG_CRAMFS=m
# CONFIG_VXFS_FS is not set CONFIG_VXFS_FS=m
CONFIG_HPFS_FS=m CONFIG_HPFS_FS=m
# CONFIG_QNX4FS_FS is not set CONFIG_QNX4FS_FS=m
# CONFIG_QNX4FS_RW is not set
CONFIG_SYSV_FS=m CONFIG_SYSV_FS=m
CONFIG_UFS_FS=m CONFIG_UFS_FS=m
CONFIG_UFS_FS_WRITE=y CONFIG_UFS_FS_WRITE=y
...@@ -997,12 +1037,22 @@ CONFIG_EXPORTFS=m ...@@ -997,12 +1037,22 @@ CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_KRB5=m
# CONFIG_SMB_FS is not set CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
CONFIG_CIFS=m CONFIG_CIFS=m
# CONFIG_NCP_FS is not set CONFIG_NCP_FS=m
# CONFIG_NCPFS_PACKET_SIGNING is not set
# CONFIG_NCPFS_IOCTL_LOCKING is not set
# CONFIG_NCPFS_STRONG is not set
# CONFIG_NCPFS_NFS_NS is not set
# CONFIG_NCPFS_OS2_NS is not set
# CONFIG_NCPFS_SMALLDOS is not set
# CONFIG_NCPFS_NLS is not set
# CONFIG_NCPFS_EXTRAS is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
# CONFIG_INTERMEZZO_FS is not set # CONFIG_INTERMEZZO_FS is not set
# CONFIG_AFS_FS is not set CONFIG_AFS_FS=m
CONFIG_RXRPC=m
# #
# Partition Types # Partition Types
...@@ -1010,6 +1060,7 @@ CONFIG_CODA_FS=m ...@@ -1010,6 +1060,7 @@ CONFIG_CODA_FS=m
# CONFIG_PARTITION_ADVANCED is not set # CONFIG_PARTITION_ADVANCED is not set
CONFIG_MSDOS_PARTITION=y CONFIG_MSDOS_PARTITION=y
CONFIG_SUN_PARTITION=y CONFIG_SUN_PARTITION=y
CONFIG_SMB_NLS=y
CONFIG_NLS=y CONFIG_NLS=y
# #
...@@ -1210,6 +1261,7 @@ CONFIG_USB_HPUSBSCSI=m ...@@ -1210,6 +1261,7 @@ CONFIG_USB_HPUSBSCSI=m
# #
# USB Network adaptors # USB Network adaptors
# #
CONFIG_USB_AX8817X=m
CONFIG_USB_CATC=m CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m CONFIG_USB_KAWETH=m
CONFIG_USB_PEGASUS=m CONFIG_USB_PEGASUS=m
......
...@@ -1003,7 +1003,7 @@ pcnet32_init_ring(struct net_device *dev) ...@@ -1003,7 +1003,7 @@ pcnet32_init_ring(struct net_device *dev)
skb_reserve (rx_skbuff, 2); skb_reserve (rx_skbuff, 2);
} }
if (lp->rx_dma_addr[i] == 0) if (lp->rx_dma_addr[i] == 0)
lp->rx_dma_addr[i] = pci_map_single(lp->pci_dev, rx_skbuff->tail, rx_skbuff->len, PCI_DMA_FROMDEVICE); lp->rx_dma_addr[i] = pci_map_single(lp->pci_dev, rx_skbuff->tail, rx_skbuff->len, PCI_DMA_FROMDEVICE);
lp->rx_ring[i].base = (u32)le32_to_cpu(lp->rx_dma_addr[i]); lp->rx_ring[i].base = (u32)le32_to_cpu(lp->rx_dma_addr[i]);
lp->rx_ring[i].buf_length = le16_to_cpu(-PKT_BUF_SZ); lp->rx_ring[i].buf_length = le16_to_cpu(-PKT_BUF_SZ);
......
...@@ -980,8 +980,8 @@ static void tx_timeout(struct net_device *dev) ...@@ -980,8 +980,8 @@ static void tx_timeout(struct net_device *dev)
{ {
int i; int i;
for (i=0; i<TX_RING_SIZE; i++) { for (i=0; i<TX_RING_SIZE; i++) {
printk(KERN_DEBUG "%02x %08x %08x %08x(%02x) %08x %08x\n", i, printk(KERN_DEBUG "%02x %08Zx %08x %08x(%02x) %08x %08x\n", i,
np->tx_ring_dma + i*sizeof(*np->tx_ring), np->tx_ring_dma + i*sizeof(*np->tx_ring),
le32_to_cpu(np->tx_ring[i].next_desc), le32_to_cpu(np->tx_ring[i].next_desc),
le32_to_cpu(np->tx_ring[i].status), le32_to_cpu(np->tx_ring[i].status),
(le32_to_cpu(np->tx_ring[i].status) >> 2) & 0xff, (le32_to_cpu(np->tx_ring[i].status) >> 2) & 0xff,
...@@ -1666,7 +1666,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -1666,7 +1666,7 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
switch (cmd) { switch (cmd) {
case SIOCDEVPRIVATE: case SIOCDEVPRIVATE:
for (i=0; i<TX_RING_SIZE; i++) { for (i=0; i<TX_RING_SIZE; i++) {
printk(KERN_DEBUG "%02x %08x %08x %08x(%02x) %08x %08x\n", i, printk(KERN_DEBUG "%02x %08Zx %08x %08x(%02x) %08x %08x\n", i,
np->tx_ring_dma + i*sizeof(*np->tx_ring), np->tx_ring_dma + i*sizeof(*np->tx_ring),
le32_to_cpu(np->tx_ring[i].next_desc), le32_to_cpu(np->tx_ring[i].next_desc),
le32_to_cpu(np->tx_ring[i].status), le32_to_cpu(np->tx_ring[i].status),
......
...@@ -1518,7 +1518,7 @@ static unsigned long aac_build_sg(Scsi_Cmnd* scsicmd, struct sgmap* psg) ...@@ -1518,7 +1518,7 @@ static unsigned long aac_build_sg(Scsi_Cmnd* scsicmd, struct sgmap* psg)
dev = (struct aac_dev *)scsicmd->device->host->hostdata; dev = (struct aac_dev *)scsicmd->device->host->hostdata;
// Get rid of old data // Get rid of old data
psg->count = cpu_to_le32(0); psg->count = cpu_to_le32(0);
psg->sg[0].addr = cpu_to_le32(NULL); psg->sg[0].addr = cpu_to_le32(0);
psg->sg[0].count = cpu_to_le32(0); psg->sg[0].count = cpu_to_le32(0);
if (scsicmd->use_sg) { if (scsicmd->use_sg) {
struct scatterlist *sg; struct scatterlist *sg;
...@@ -1558,7 +1558,7 @@ static unsigned long aac_build_sg(Scsi_Cmnd* scsicmd, struct sgmap* psg) ...@@ -1558,7 +1558,7 @@ static unsigned long aac_build_sg(Scsi_Cmnd* scsicmd, struct sgmap* psg)
psg->count = cpu_to_le32(1); psg->count = cpu_to_le32(1);
psg->sg[0].addr = cpu_to_le32(addr); psg->sg[0].addr = cpu_to_le32(addr);
psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen); psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);
scsicmd->SCp.ptr = (char *)addr; scsicmd->SCp.ptr = (char *)(ulong)addr;
byte_count = scsicmd->request_bufflen; byte_count = scsicmd->request_bufflen;
} }
return byte_count; return byte_count;
...@@ -1574,8 +1574,8 @@ static unsigned long aac_build_sg64(Scsi_Cmnd* scsicmd, struct sgmap64* psg) ...@@ -1574,8 +1574,8 @@ static unsigned long aac_build_sg64(Scsi_Cmnd* scsicmd, struct sgmap64* psg)
dev = (struct aac_dev *)scsicmd->device->host->hostdata; dev = (struct aac_dev *)scsicmd->device->host->hostdata;
// Get rid of old data // Get rid of old data
psg->count = cpu_to_le32(0); psg->count = cpu_to_le32(0);
psg->sg[0].addr[0] = cpu_to_le32(NULL); psg->sg[0].addr[0] = cpu_to_le32(0);
psg->sg[0].addr[1] = cpu_to_le32(NULL); psg->sg[0].addr[1] = cpu_to_le32(0);
psg->sg[0].count = cpu_to_le32(0); psg->sg[0].count = cpu_to_le32(0);
if (scsicmd->use_sg) { if (scsicmd->use_sg) {
struct scatterlist *sg; struct scatterlist *sg;
...@@ -1619,7 +1619,7 @@ static unsigned long aac_build_sg64(Scsi_Cmnd* scsicmd, struct sgmap64* psg) ...@@ -1619,7 +1619,7 @@ static unsigned long aac_build_sg64(Scsi_Cmnd* scsicmd, struct sgmap64* psg)
psg->sg[0].addr[1] = (u32)(le_addr>>32); psg->sg[0].addr[1] = (u32)(le_addr>>32);
psg->sg[0].addr[0] = (u32)(le_addr & 0xffffffff); psg->sg[0].addr[0] = (u32)(le_addr & 0xffffffff);
psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen); psg->sg[0].count = cpu_to_le32(scsicmd->request_bufflen);
scsicmd->SCp.ptr = (char *)addr; scsicmd->SCp.ptr = (char *)(ulong)addr;
byte_count = scsicmd->request_bufflen; byte_count = scsicmd->request_bufflen;
} }
return byte_count; return byte_count;
......
...@@ -52,9 +52,11 @@ static int ahd_linux_pci_dev_probe(struct pci_dev *pdev, ...@@ -52,9 +52,11 @@ static int ahd_linux_pci_dev_probe(struct pci_dev *pdev,
const struct pci_device_id *ent); const struct pci_device_id *ent);
static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, static int ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
u_long *base, u_long *base2); u_long *base, u_long *base2);
#ifdef MMAPIO
static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, static int ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr, u_long *bus_addr,
uint8_t **maddr); uint8_t **maddr);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
static void ahd_linux_pci_dev_remove(struct pci_dev *pdev); static void ahd_linux_pci_dev_remove(struct pci_dev *pdev);
...@@ -271,6 +273,7 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base, ...@@ -271,6 +273,7 @@ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
return (0); return (0);
} }
#ifdef MMAPIO
static int static int
ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
u_long *bus_addr, u_long *bus_addr,
...@@ -318,6 +321,7 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd, ...@@ -318,6 +321,7 @@ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
error = ENOMEM; error = ENOMEM;
return (error); return (error);
} }
#endif
int int
ahd_pci_map_registers(struct ahd_softc *ahd) ahd_pci_map_registers(struct ahd_softc *ahd)
......
...@@ -7247,8 +7247,8 @@ static int ixj_get_status_proc(char *buf) ...@@ -7247,8 +7247,8 @@ static int ixj_get_status_proc(char *buf)
len += sprintf(buf + len, "\n%s", ixj_h_rcsid); len += sprintf(buf + len, "\n%s", ixj_h_rcsid);
len += sprintf(buf + len, "\n%s", ixjuser_h_rcsid); len += sprintf(buf + len, "\n%s", ixjuser_h_rcsid);
len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER); len += sprintf(buf + len, "\nDriver version %i.%i.%i", IXJ_VER_MAJOR, IXJ_VER_MINOR, IXJ_BLD_VER);
len += sprintf(buf + len, "\nsizeof IXJ struct %d bytes", sizeof(IXJ)); len += sprintf(buf + len, "\nsizeof IXJ struct %Zd bytes", sizeof(IXJ));
len += sprintf(buf + len, "\nsizeof DAA struct %d bytes", sizeof(DAA_REGS)); len += sprintf(buf + len, "\nsizeof DAA struct %Zd bytes", sizeof(DAA_REGS));
len += sprintf(buf + len, "\nUsing old telephony API"); len += sprintf(buf + len, "\nUsing old telephony API");
len += sprintf(buf + len, "\nDebug Level %d\n", ixjdebug); len += sprintf(buf + len, "\nDebug Level %d\n", ixjdebug);
......
...@@ -1213,7 +1213,7 @@ typedef struct { ...@@ -1213,7 +1213,7 @@ typedef struct {
#endif #endif
char *read_buffer, *read_buffer_end; char *read_buffer, *read_buffer_end;
char *read_convert_buffer; char *read_convert_buffer;
unsigned int read_buffer_size; size_t read_buffer_size;
unsigned int read_buffer_ready; unsigned int read_buffer_ready;
#if LINUX_VERSION_CODE < 0x020400 #if LINUX_VERSION_CODE < 0x020400
struct wait_queue *write_q; struct wait_queue *write_q;
...@@ -1222,7 +1222,7 @@ typedef struct { ...@@ -1222,7 +1222,7 @@ typedef struct {
#endif #endif
char *write_buffer, *write_buffer_end; char *write_buffer, *write_buffer_end;
char *write_convert_buffer; char *write_convert_buffer;
unsigned int write_buffer_size; size_t write_buffer_size;
unsigned int write_buffers_empty; unsigned int write_buffers_empty;
unsigned long drybuffer; unsigned long drybuffer;
char *write_buffer_rp, *write_buffer_wp; char *write_buffer_rp, *write_buffer_wp;
...@@ -1281,7 +1281,7 @@ typedef struct { ...@@ -1281,7 +1281,7 @@ typedef struct {
unsigned char fskcnt; unsigned char fskcnt;
unsigned int cidsize; unsigned int cidsize;
unsigned int cidcnt; unsigned int cidcnt;
unsigned pstn_cid_received; unsigned long pstn_cid_received;
PHONE_CID cid; PHONE_CID cid;
PHONE_CID cid_send; PHONE_CID cid_send;
unsigned long pstn_ring_int; unsigned long pstn_ring_int;
......
...@@ -521,7 +521,7 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len) { ...@@ -521,7 +521,7 @@ static int do_tcp_rcv(struct ncp_server *server, void *buffer, size_t len) {
return result; return result;
} }
if (result > len) { if (result > len) {
printk(KERN_ERR "ncpfs: tcp: bug in recvmsg (%u > %u)\n", result, len); printk(KERN_ERR "ncpfs: tcp: bug in recvmsg (%u > %Zu)\n", result, len);
return -EIO; return -EIO;
} }
return result; return result;
...@@ -614,7 +614,7 @@ skipdata:; ...@@ -614,7 +614,7 @@ skipdata:;
goto skipdata2; goto skipdata2;
} }
if (datalen > req->datalen + 8) { if (datalen > req->datalen + 8) {
printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d (expected at most %d)\n", datalen, req->datalen + 8); printk(KERN_ERR "ncpfs: tcp: Unexpected reply len %d (expected at most %Zd)\n", datalen, req->datalen + 8);
server->rcv.state = 3; server->rcv.state = 3;
goto skipdata; goto skipdata;
} }
......
...@@ -91,13 +91,13 @@ static int show_map(struct seq_file *m, void *v) ...@@ -91,13 +91,13 @@ static int show_map(struct seq_file *m, void *v)
} }
seq_printf(m, "%0*lx-%0*lx %c%c%c%c %0*lx %02x:%02x %lu %n", seq_printf(m, "%0*lx-%0*lx %c%c%c%c %0*lx %02x:%02x %lu %n",
2*sizeof(void*), map->vm_start, (int) (2*sizeof(void*)), map->vm_start,
2*sizeof(void*), map->vm_end, (int) (2*sizeof(void*)), map->vm_end,
flags & VM_READ ? 'r' : '-', flags & VM_READ ? 'r' : '-',
flags & VM_WRITE ? 'w' : '-', flags & VM_WRITE ? 'w' : '-',
flags & VM_EXEC ? 'x' : '-', flags & VM_EXEC ? 'x' : '-',
flags & VM_MAYSHARE ? 's' : 'p', flags & VM_MAYSHARE ? 's' : 'p',
2*sizeof(void*), map->vm_pgoff << PAGE_SHIFT, (int) (2*sizeof(void*)), map->vm_pgoff << PAGE_SHIFT,
MAJOR(dev), MINOR(dev), ino, &len); MAJOR(dev), MINOR(dev), ino, &len);
if (map->vm_file) { if (map->vm_file) {
......
...@@ -231,7 +231,7 @@ static void __irda_task_delete(struct irda_task *task) ...@@ -231,7 +231,7 @@ static void __irda_task_delete(struct irda_task *task)
void irda_task_delete(struct irda_task *task) void irda_task_delete(struct irda_task *task)
{ {
/* Unregister task */ /* Unregister task */
hashbin_remove(tasks, (int) task, NULL); hashbin_remove(tasks, (long) task, NULL);
__irda_task_delete(task); __irda_task_delete(task);
} }
...@@ -345,7 +345,7 @@ struct irda_task *irda_task_execute(void *instance, ...@@ -345,7 +345,7 @@ struct irda_task *irda_task_execute(void *instance,
init_timer(&task->timer); init_timer(&task->timer);
/* Register task */ /* Register task */
hashbin_insert(tasks, (irda_queue_t *) task, (int) task, NULL); hashbin_insert(tasks, (irda_queue_t *) task, (long) task, NULL);
/* No time to waste, so lets get going! */ /* No time to waste, so lets get going! */
ret = irda_task_kick(task); ret = irda_task_kick(task);
......
This diff is collapsed.
...@@ -43,7 +43,7 @@ irnet_ctrl_write(irnet_socket * ap, ...@@ -43,7 +43,7 @@ irnet_ctrl_write(irnet_socket * ap,
char * next; /* Next command to process */ char * next; /* Next command to process */
int length; /* Length of current command */ int length; /* Length of current command */
DENTER(CTRL_TRACE, "(ap=0x%X, count=%d)\n", (unsigned int) ap, count); DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
/* Check for overflow... */ /* Check for overflow... */
DABORT(count >= IRNET_MAX_COMMAND, -ENOMEM, DABORT(count >= IRNET_MAX_COMMAND, -ENOMEM,
...@@ -58,7 +58,7 @@ irnet_ctrl_write(irnet_socket * ap, ...@@ -58,7 +58,7 @@ irnet_ctrl_write(irnet_socket * ap,
/* Safe terminate the string */ /* Safe terminate the string */
command[count] = '\0'; command[count] = '\0';
DEBUG(CTRL_INFO, "Command line received is ``%s'' (%d).\n", DEBUG(CTRL_INFO, "Command line received is ``%s'' (%Zd).\n",
command, count); command, count);
/* Check every commands in the command line */ /* Check every commands in the command line */
...@@ -184,8 +184,8 @@ irnet_read_discovery_log(irnet_socket * ap, ...@@ -184,8 +184,8 @@ irnet_read_discovery_log(irnet_socket * ap,
{ {
int done_event = 0; int done_event = 0;
DENTER(CTRL_TRACE, "(ap=0x%X, event=0x%X)\n", DENTER(CTRL_TRACE, "(ap=0x%p, event=0x%p)\n",
(unsigned int) ap, (unsigned int) event); ap, event);
/* Test if we have some work to do or we have already finished */ /* Test if we have some work to do or we have already finished */
if(ap->disco_number == -1) if(ap->disco_number == -1)
...@@ -205,8 +205,8 @@ irnet_read_discovery_log(irnet_socket * ap, ...@@ -205,8 +205,8 @@ irnet_read_discovery_log(irnet_socket * ap,
/* Check if the we got some results */ /* Check if the we got some results */
if(ap->discoveries == NULL) if(ap->discoveries == NULL)
ap->disco_number = -1; ap->disco_number = -1;
DEBUG(CTRL_INFO, "Got the log (0x%X), size is %d\n", DEBUG(CTRL_INFO, "Got the log (0x%p), size is %d\n",
(unsigned int) ap->discoveries, ap->disco_number); ap->discoveries, ap->disco_number);
} }
/* Check if we have more item to dump */ /* Check if we have more item to dump */
...@@ -232,8 +232,8 @@ irnet_read_discovery_log(irnet_socket * ap, ...@@ -232,8 +232,8 @@ irnet_read_discovery_log(irnet_socket * ap,
if(ap->disco_index >= ap->disco_number) if(ap->disco_index >= ap->disco_number)
{ {
/* No more items : remove the log and signal termination */ /* No more items : remove the log and signal termination */
DEBUG(CTRL_INFO, "Cleaning up log (0x%X)\n", DEBUG(CTRL_INFO, "Cleaning up log (0x%p)\n",
(unsigned int) ap->discoveries); ap->discoveries);
if(ap->discoveries != NULL) if(ap->discoveries != NULL)
{ {
/* Cleanup our copy of the discovery log */ /* Cleanup our copy of the discovery log */
...@@ -261,7 +261,7 @@ irnet_ctrl_read(irnet_socket * ap, ...@@ -261,7 +261,7 @@ irnet_ctrl_read(irnet_socket * ap,
char event[64]; /* Max event is 61 char */ char event[64]; /* Max event is 61 char */
ssize_t ret = 0; ssize_t ret = 0;
DENTER(CTRL_TRACE, "(ap=0x%X, count=%d)\n", (unsigned int) ap, count); DENTER(CTRL_TRACE, "(ap=0x%p, count=%Zd)\n", ap, count);
/* Check if we can write an event out in one go */ /* Check if we can write an event out in one go */
DABORT(count < sizeof(event), -EOVERFLOW, CTRL_ERROR, "Buffer to small.\n"); DABORT(count < sizeof(event), -EOVERFLOW, CTRL_ERROR, "Buffer to small.\n");
...@@ -307,7 +307,7 @@ irnet_ctrl_read(irnet_socket * ap, ...@@ -307,7 +307,7 @@ irnet_ctrl_read(irnet_socket * ap,
if(ret != 0) if(ret != 0)
{ {
/* No, return the error code */ /* No, return the error code */
DEXIT(CTRL_TRACE, " - ret %d\n", ret); DEXIT(CTRL_TRACE, " - ret %Zd\n", ret);
return ret; return ret;
} }
...@@ -402,7 +402,7 @@ irnet_ctrl_poll(irnet_socket * ap, ...@@ -402,7 +402,7 @@ irnet_ctrl_poll(irnet_socket * ap,
{ {
unsigned int mask; unsigned int mask;
DENTER(CTRL_TRACE, "(ap=0x%X)\n", (unsigned int) ap); DENTER(CTRL_TRACE, "(ap=0x%p)\n", ap);
poll_wait(file, &irnet_events.rwait, wait); poll_wait(file, &irnet_events.rwait, wait);
mask = POLLOUT | POLLWRNORM; mask = POLLOUT | POLLWRNORM;
...@@ -439,7 +439,7 @@ dev_irnet_open(struct inode * inode, ...@@ -439,7 +439,7 @@ dev_irnet_open(struct inode * inode,
struct irnet_socket * ap; struct irnet_socket * ap;
int err; int err;
DENTER(FS_TRACE, "(file=0x%X)\n", (unsigned int) file); DENTER(FS_TRACE, "(file=0x%p)\n", file);
#ifdef SECURE_DEVIRNET #ifdef SECURE_DEVIRNET
/* This could (should?) be enforced by the permissions on /dev/irnet. */ /* This could (should?) be enforced by the permissions on /dev/irnet. */
...@@ -482,7 +482,7 @@ dev_irnet_open(struct inode * inode, ...@@ -482,7 +482,7 @@ dev_irnet_open(struct inode * inode,
/* Put our stuff where we will be able to find it later */ /* Put our stuff where we will be able to find it later */
file->private_data = ap; file->private_data = ap;
DEXIT(FS_TRACE, " - ap=0x%X\n", (unsigned int) ap); DEXIT(FS_TRACE, " - ap=0x%p\n", ap);
return 0; return 0;
} }
...@@ -498,8 +498,8 @@ dev_irnet_close(struct inode * inode, ...@@ -498,8 +498,8 @@ dev_irnet_close(struct inode * inode,
{ {
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
DENTER(FS_TRACE, "(file=0x%X, ap=0x%X)\n", DENTER(FS_TRACE, "(file=0x%p, ap=0x%p)\n",
(unsigned int) file, (unsigned int) ap); file, ap);
DABORT(ap == NULL, 0, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, 0, FS_ERROR, "ap is NULL !!!\n");
/* Detach ourselves */ /* Detach ourselves */
...@@ -535,8 +535,8 @@ dev_irnet_write(struct file * file, ...@@ -535,8 +535,8 @@ dev_irnet_write(struct file * file,
{ {
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
DPASS(FS_TRACE, "(file=0x%X, ap=0x%X, count=%d)\n", DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
(unsigned int) file, (unsigned int) ap, count); file, ap, count);
DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
/* If we are connected to ppp_generic, let it handle the job */ /* If we are connected to ppp_generic, let it handle the job */
...@@ -559,8 +559,8 @@ dev_irnet_read(struct file * file, ...@@ -559,8 +559,8 @@ dev_irnet_read(struct file * file,
{ {
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
DPASS(FS_TRACE, "(file=0x%X, ap=0x%X, count=%d)\n", DPASS(FS_TRACE, "(file=0x%p, ap=0x%p, count=%Zd)\n",
(unsigned int) file, (unsigned int) ap, count); file, ap, count);
DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, -ENXIO, FS_ERROR, "ap is NULL !!!\n");
/* If we are connected to ppp_generic, let it handle the job */ /* If we are connected to ppp_generic, let it handle the job */
...@@ -581,8 +581,8 @@ dev_irnet_poll(struct file * file, ...@@ -581,8 +581,8 @@ dev_irnet_poll(struct file * file,
irnet_socket * ap = (struct irnet_socket *) file->private_data; irnet_socket * ap = (struct irnet_socket *) file->private_data;
unsigned int mask; unsigned int mask;
DENTER(FS_TRACE, "(file=0x%X, ap=0x%X)\n", DENTER(FS_TRACE, "(file=0x%p, ap=0x%p)\n",
(unsigned int) file, (unsigned int) ap); file, ap);
mask = POLLOUT | POLLWRNORM; mask = POLLOUT | POLLWRNORM;
DABORT(ap == NULL, mask, FS_ERROR, "ap is NULL !!!\n"); DABORT(ap == NULL, mask, FS_ERROR, "ap is NULL !!!\n");
...@@ -611,8 +611,8 @@ dev_irnet_ioctl(struct inode * inode, ...@@ -611,8 +611,8 @@ dev_irnet_ioctl(struct inode * inode,
int err; int err;
int val; int val;
DENTER(FS_TRACE, "(file=0x%X, ap=0x%X, cmd=0x%X)\n", DENTER(FS_TRACE, "(file=0x%p, ap=0x%p, cmd=0x%X)\n",
(unsigned int) file, (unsigned int) ap, cmd); file, ap, cmd);
/* Basic checks... */ /* Basic checks... */
DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n"); DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n");
...@@ -777,8 +777,8 @@ irnet_prepare_skb(irnet_socket * ap, ...@@ -777,8 +777,8 @@ irnet_prepare_skb(irnet_socket * ap,
int islcp; /* Protocol == LCP */ int islcp; /* Protocol == LCP */
int needaddr; /* Need PPP address */ int needaddr; /* Need PPP address */
DENTER(PPP_TRACE, "(ap=0x%X, skb=0x%X)\n", DENTER(PPP_TRACE, "(ap=0x%p, skb=0x%p)\n",
(unsigned int) ap, (unsigned int) skb); ap, skb);
/* Extract PPP protocol from the frame */ /* Extract PPP protocol from the frame */
data = skb->data; data = skb->data;
...@@ -845,8 +845,8 @@ ppp_irnet_send(struct ppp_channel * chan, ...@@ -845,8 +845,8 @@ ppp_irnet_send(struct ppp_channel * chan,
irnet_socket * self = (struct irnet_socket *) chan->private; irnet_socket * self = (struct irnet_socket *) chan->private;
int ret; int ret;
DENTER(PPP_TRACE, "(channel=0x%X, ap/self=0x%X)\n", DENTER(PPP_TRACE, "(channel=0x%p, ap/self=0x%p)\n",
(unsigned int) chan, (unsigned int) self); chan, self);
/* Check if things are somewhat valid... */ /* Check if things are somewhat valid... */
DASSERT(self != NULL, 0, PPP_ERROR, "Self is NULL !!!\n"); DASSERT(self != NULL, 0, PPP_ERROR, "Self is NULL !!!\n");
...@@ -949,8 +949,8 @@ ppp_irnet_ioctl(struct ppp_channel * chan, ...@@ -949,8 +949,8 @@ ppp_irnet_ioctl(struct ppp_channel * chan,
int val; int val;
u32 accm[8]; u32 accm[8];
DENTER(PPP_TRACE, "(channel=0x%X, ap=0x%X, cmd=0x%X)\n", DENTER(PPP_TRACE, "(channel=0x%p, ap=0x%p, cmd=0x%X)\n",
(unsigned int) chan, (unsigned int) ap, cmd); chan, ap, cmd);
/* Basic checks... */ /* Basic checks... */
DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n"); DASSERT(ap != NULL, -ENXIO, PPP_ERROR, "ap is NULL...\n");
......
...@@ -1408,7 +1408,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance) ...@@ -1408,7 +1408,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance)
spin_lock_irqsave(&irttp->tsaps->hb_spinlock, flags); spin_lock_irqsave(&irttp->tsaps->hb_spinlock, flags);
/* Find the old instance */ /* Find the old instance */
if (!hashbin_find(irttp->tsaps, (int) orig, NULL)) { if (!hashbin_find(irttp->tsaps, (long) orig, NULL)) {
IRDA_DEBUG(0, "%s(), unable to find TSAP\n", __FUNCTION__); IRDA_DEBUG(0, "%s(), unable to find TSAP\n", __FUNCTION__);
spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags); spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags);
return NULL; return NULL;
......
...@@ -492,7 +492,7 @@ static void conf(struct menu *menu) ...@@ -492,7 +492,7 @@ static void conf(struct menu *menu)
switch (type) { switch (type) {
case 'm': case 'm':
if (single_menu_mode) if (single_menu_mode)
submenu->data = (void *) !submenu->data; submenu->data = (void *) (long) !submenu->data;
else else
conf(submenu); conf(submenu);
break; break;
......
...@@ -2070,7 +2070,7 @@ static void snd_korg1212_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *b ...@@ -2070,7 +2070,7 @@ static void snd_korg1212_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *b
snd_iprintf(buffer, korg1212->card->longname); snd_iprintf(buffer, korg1212->card->longname);
snd_iprintf(buffer, " (index #%d)\n", korg1212->card->number + 1); snd_iprintf(buffer, " (index #%d)\n", korg1212->card->number + 1);
snd_iprintf(buffer, "\nGeneral settings\n"); snd_iprintf(buffer, "\nGeneral settings\n");
snd_iprintf(buffer, " period size: %d bytes\n", K1212_PERIOD_BYTES); snd_iprintf(buffer, " period size: %Zd bytes\n", K1212_PERIOD_BYTES);
snd_iprintf(buffer, " clock mode: %s\n", clockSourceName[korg1212->clkSrcRate] ); snd_iprintf(buffer, " clock mode: %s\n", clockSourceName[korg1212->clkSrcRate] );
snd_iprintf(buffer, " left ADC Sens: %d\n", korg1212->leftADCInSens ); snd_iprintf(buffer, " left ADC Sens: %d\n", korg1212->leftADCInSens );
snd_iprintf(buffer, " right ADC Sens: %d\n", korg1212->rightADCInSens ); snd_iprintf(buffer, " right ADC Sens: %d\n", korg1212->rightADCInSens );
...@@ -2336,7 +2336,7 @@ static int __devinit snd_korg1212_create(snd_card_t * card, struct pci_dev *pci, ...@@ -2336,7 +2336,7 @@ static int __devinit snd_korg1212_create(snd_card_t * card, struct pci_dev *pci,
korg1212->sharedBufferPhy = (unsigned long)phys_addr; korg1212->sharedBufferPhy = (unsigned long)phys_addr;
if (korg1212->sharedBufferPtr == NULL) { if (korg1212->sharedBufferPtr == NULL) {
snd_printk(KERN_ERR "can not allocate shared buffer memory (%d bytes)\n", sizeof(KorgSharedBuffer)); snd_printk(KERN_ERR "can not allocate shared buffer memory (%Zd bytes)\n", sizeof(KorgSharedBuffer));
return -ENOMEM; return -ENOMEM;
} }
...@@ -2385,9 +2385,12 @@ static int __devinit snd_korg1212_create(snd_card_t * card, struct pci_dev *pci, ...@@ -2385,9 +2385,12 @@ static int __devinit snd_korg1212_create(snd_card_t * card, struct pci_dev *pci,
korg1212->dspCodeSize = sizeof (dspCode); korg1212->dspCodeSize = sizeof (dspCode);
korg1212->VolumeTablePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->volumeData; korg1212->VolumeTablePhy = korg1212->sharedBufferPhy +
korg1212->RoutingTablePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->routeData; offsetof(KorgSharedBuffer, volumeData);
korg1212->AdatTimeCodePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->AdatTimeCode; korg1212->RoutingTablePhy = korg1212->sharedBufferPhy +
offsetof(KorgSharedBuffer, routeData);
korg1212->AdatTimeCodePhy = korg1212->sharedBufferPhy +
offsetof(KorgSharedBuffer, AdatTimeCode);
korg1212->dspMemPtr = snd_malloc_pci_pages(korg1212->pci, korg1212->dspCodeSize, &phys_addr); korg1212->dspMemPtr = snd_malloc_pci_pages(korg1212->pci, korg1212->dspCodeSize, &phys_addr);
korg1212->dspMemPhy = (u32)phys_addr; korg1212->dspMemPhy = (u32)phys_addr;
......
...@@ -56,7 +56,7 @@ static void cpio_trailer(void) ...@@ -56,7 +56,7 @@ static void cpio_trailer(void)
const char *name = "TRAILER!!!"; const char *name = "TRAILER!!!";
sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08ZX%08X",
"070701", /* magic */ "070701", /* magic */
0, /* ino */ 0, /* ino */
0, /* mode */ 0, /* mode */
...@@ -87,7 +87,7 @@ static void cpio_mkdir(const char *name, unsigned int mode, ...@@ -87,7 +87,7 @@ static void cpio_mkdir(const char *name, unsigned int mode,
time_t mtime = time(NULL); time_t mtime = time(NULL);
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08ZX%08X",
"070701", /* magic */ "070701", /* magic */
ino++, /* ino */ ino++, /* ino */
S_IFDIR | mode, /* mode */ S_IFDIR | mode, /* mode */
...@@ -119,7 +119,7 @@ static void cpio_mknod(const char *name, unsigned int mode, ...@@ -119,7 +119,7 @@ static void cpio_mknod(const char *name, unsigned int mode,
mode |= S_IFCHR; mode |= S_IFCHR;
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08ZX%08X",
"070701", /* magic */ "070701", /* magic */
ino++, /* ino */ ino++, /* ino */
mode, /* mode */ mode, /* mode */
...@@ -176,7 +176,7 @@ void cpio_mkfile(const char *filename, const char *location, ...@@ -176,7 +176,7 @@ void cpio_mkfile(const char *filename, const char *location,
} }
sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX"
"%08X%08X%08X%08X%08X%08X%08X", "%08X%08X%08X%08X%08X%08ZX%08X",
"070701", /* magic */ "070701", /* magic */
ino++, /* ino */ ino++, /* ino */
mode, /* mode */ mode, /* mode */
......
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