Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[sfrench/cifs-2.6.git] / drivers / telephony / ixj.c

diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index f6b2948ab28856dad684763d2e9e4c52102bf54e..71cb64e41a1bb6721e47c63de681af7baa0655cf 100644 (file)
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -284,6 +284,14 @@ static int samplerate = 100;
 
 module_param(ixjdebug, int, 0);
 
+static struct pci_device_id ixj_pci_tbl[] __devinitdata = {
+       { PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       { }
+};
+
+MODULE_DEVICE_TABLE(pci, ixj_pci_tbl);
+
 /************************************************************************
 *
 * ixjdebug meanings are now bit mapped instead of level based
@@ -640,9 +648,9 @@ static inline BYTE SLIC_GetState(IXJ *j)
        return j->pld_slicr.bits.state;
 }
 
-static BOOL SLIC_SetState(BYTE byState, IXJ *j)
+static bool SLIC_SetState(BYTE byState, IXJ *j)
 {
-       BOOL fRetVal = FALSE;
+       bool fRetVal = false;
 
        if (j->cardtype == QTI_PHONECARD) {
                if (j->flags.pcmciasct) {
@@ -651,14 +659,14 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        case PLD_SLIC_STATE_OC:
                                j->pslic.bits.powerdown = 1;
                                j->pslic.bits.ring0 = j->pslic.bits.ring1 = 0;
-                               fRetVal = TRUE;
+                               fRetVal = true;
                                break;
                        case PLD_SLIC_STATE_RINGING:
                                if (j->readers || j->writers) {
                                        j->pslic.bits.powerdown = 0;
                                        j->pslic.bits.ring0 = 1;
                                        j->pslic.bits.ring1 = 0;
-                                       fRetVal = TRUE;
+                                       fRetVal = true;
                                }
                                break;
                        case PLD_SLIC_STATE_OHT:        /* On-hook transmit */
@@ -671,14 +679,14 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                                        j->pslic.bits.powerdown = 1;
                                }
                                j->pslic.bits.ring0 = j->pslic.bits.ring1 = 0;
-                               fRetVal = TRUE;
+                               fRetVal = true;
                                break;
                        case PLD_SLIC_STATE_APR:        /* Active polarity reversal */
 
                        case PLD_SLIC_STATE_OHTPR:      /* OHT polarity reversal */
 
                        default:
-                               fRetVal = FALSE;
+                               fRetVal = false;
                                break;
                        }
                        j->psccr.bits.dev = 3;
@@ -695,7 +703,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 0;
                        j->pld_slicw.bits.b2en = 0;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_RINGING:
                        j->pld_slicw.bits.c1 = 1;
@@ -703,7 +711,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 0;
                        j->pld_slicw.bits.b2en = 1;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_ACTIVE:
                        j->pld_slicw.bits.c1 = 0;
@@ -711,7 +719,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 0;
                        j->pld_slicw.bits.b2en = 0;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_OHT:        /* On-hook transmit */
 
@@ -720,7 +728,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 0;
                        j->pld_slicw.bits.b2en = 0;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_TIPOPEN:
                        j->pld_slicw.bits.c1 = 0;
@@ -728,7 +736,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 1;
                        j->pld_slicw.bits.b2en = 0;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_STANDBY:
                        j->pld_slicw.bits.c1 = 1;
@@ -736,7 +744,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 1;
                        j->pld_slicw.bits.b2en = 1;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_APR:        /* Active polarity reversal */
 
@@ -745,7 +753,7 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 1;
                        j->pld_slicw.bits.b2en = 0;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                case PLD_SLIC_STATE_OHTPR:      /* OHT polarity reversal */
 
@@ -754,10 +762,10 @@ static BOOL SLIC_SetState(BYTE byState, IXJ *j)
                        j->pld_slicw.bits.c3 = 1;
                        j->pld_slicw.bits.b2en = 0;
                        outb_p(j->pld_slicw.byte, j->XILINXbase + 0x01);
-                       fRetVal = TRUE;
+                       fRetVal = true;
                        break;
                default:
-                       fRetVal = FALSE;
+                       fRetVal = false;
                        break;
                }
        }
@@ -2739,7 +2747,7 @@ static void alaw2ulaw(unsigned char *buff, unsigned long len)
 static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos)
 {
        unsigned long i = *ppos;
-       IXJ * j = get_ixj(NUM(file_p->f_dentry->d_inode));
+       IXJ * j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
 
        DECLARE_WAITQUEUE(wait, current);
 
@@ -2796,7 +2804,7 @@ static ssize_t ixj_enhanced_read(struct file * file_p, char __user *buf, size_t
 {
        int pre_retval;
        ssize_t read_retval = 0;
-       IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
+       IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
 
        pre_retval = ixj_PreRead(j, 0L);
        switch (pre_retval) {
@@ -2875,7 +2883,7 @@ static ssize_t ixj_enhanced_write(struct file * file_p, const char __user *buf,
        int pre_retval;
        ssize_t write_retval = 0;
 
-       IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
+       IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
 
        pre_retval = ixj_PreWrite(j, 0L);
        switch (pre_retval) {
@@ -4574,7 +4582,7 @@ static unsigned int ixj_poll(struct file *file_p, poll_table * wait)
 {
        unsigned int mask = 0;
 
-       IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
+       IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
 
        poll_wait(file_p, &(j->poll_q), wait);
        if (j->read_buffer_ready > 0)
@@ -4961,7 +4969,8 @@ static int ixj_daa_cid_read(IXJ *j)
 {
        int i;
        BYTES bytes;
-       char CID[ALISDAA_CALLERID_SIZE], mContinue;
+       char CID[ALISDAA_CALLERID_SIZE];
+       bool mContinue;
        char *pIn, *pOut;
 
        if (!SCI_Prepare(j))
@@ -5005,7 +5014,7 @@ static int ixj_daa_cid_read(IXJ *j)
 
        pIn = CID;
        pOut = j->m_DAAShadowRegs.CAO_REGS.CAO.CallerID;
-       mContinue = 1;
+       mContinue = true;
        while (mContinue) {
                if ((pIn[1] & 0x03) == 0x01) {
                        pOut[0] = pIn[0];
@@ -5019,7 +5028,7 @@ static int ixj_daa_cid_read(IXJ *j)
                if ((pIn[4] & 0xc0) == 0x40) {
                        pOut[3] = ((pIn[4] & 0x3f) << 2) | ((pIn[3] & 0xc0) >> 6);
                } else {
-                       mContinue = FALSE;
+                       mContinue = false;
                }
                pIn += 5, pOut += 4;
        }
@@ -6649,12 +6658,12 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd,
 
 static int ixj_fasync(int fd, struct file *file_p, int mode)
 {
-       IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode));
+       IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
 
        return fasync_helper(fd, file_p, mode, &j->async_queue);
 }
 
-static struct file_operations ixj_fops =
+static const struct file_operations ixj_fops =
 {
         .owner          = THIS_MODULE,
         .read           = ixj_enhanced_read,
@@ -7490,7 +7499,7 @@ static BYTE PCIEE_ReadBit(WORD wEEPROMAddress, BYTE lastLCC)
        return ((inb(wEEPROMAddress) >> 3) & 1);
 }
 
-static BOOL PCIEE_ReadWord(WORD wAddress, WORD wLoc, WORD * pwResult)
+static bool PCIEE_ReadWord(WORD wAddress, WORD wLoc, WORD * pwResult)
 {
        BYTE lastLCC;
        WORD wEEPROMAddress = wAddress + 3;
@@ -7683,7 +7692,8 @@ static int __init ixj_probe_pci(int *cnt)
        IXJ *j = NULL;
 
        for (i = 0; i < IXJMAX - *cnt; i++) {
-               pci = pci_find_device(0x15E2, 0x0500, pci);
+               pci = pci_find_device(PCI_VENDOR_ID_QUICKNET,
+                                     PCI_DEVICE_ID_QUICKNET_XJ, pci);
                if (!pci)
                        break;