* [PATCH] uio_netx: Add support for netPLC cards @ 2011-03-17 11:40 Daniel Trautmann 2011-03-19 0:12 ` Hans J. Koch 0 siblings, 1 reply; 4+ messages in thread From: Daniel Trautmann @ 2011-03-17 11:40 UTC (permalink / raw) To: gregkh@suse.de, linux-kernel@vger.kernel.org; +Cc: Hans J. Koch, Manuel Traut This patch adds support for Hilscher / IBHsoftec netPLC cards to uio_netx userspace IO driver. Signed-off-by: Daniel Trautmann <dtrautmann@ibhsoftec-sps.de> --- drivers/uio/uio_netx.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c index 5ffdb48..7921190 100644 --- a/drivers/uio/uio_netx.c +++ b/drivers/uio/uio_netx.c @@ -18,6 +18,9 @@ #define PCI_VENDOR_ID_HILSCHER 0x15CF #define PCI_DEVICE_ID_HILSCHER_NETX 0x0000 +#define PCI_DEVICE_ID_HILSCHER_NETPLC 0x0010 +#define PCI_SUBDEVICE_ID_NETPLC_RAM 0x0000 +#define PCI_SUBDEVICE_ID_NETPLC_FLASH 0x0001 #define PCI_SUBDEVICE_ID_NXSB_PCA 0x3235 #define PCI_SUBDEVICE_ID_NXPCA 0x3335 @@ -66,6 +69,10 @@ static int __devinit netx_pci_probe(struct pci_dev *dev, bar = 0; info->name = "netx"; break; + case PCI_DEVICE_ID_HILSCHER_NETPLC: + bar = 0; + info->name = "netplc"; + break; default: bar = 2; info->name = "netx_plx"; @@ -133,6 +140,18 @@ static struct pci_device_id netx_pci_ids[] = { .subvendor = 0, .subdevice = 0, }, + { + .vendor = PCI_VENDOR_ID_HILSCHER, + .device = PCI_DEVICE_ID_HILSCHER_NETPLC, + .subvendor = PCI_VENDOR_ID_HILSCHER, + .subdevice = PCI_SUBDEVICE_ID_NETPLC_RAM, + }, + { + .vendor = PCI_VENDOR_ID_HILSCHER, + .device = PCI_DEVICE_ID_HILSCHER_NETPLC, + .subvendor = PCI_VENDOR_ID_HILSCHER, + .subdevice = PCI_SUBDEVICE_ID_NETPLC_FLASH, + }, { .vendor = PCI_VENDOR_ID_PLX, .device = PCI_DEVICE_ID_PLX_9030, ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] uio_netx: Add support for netPLC cards 2011-03-17 11:40 [PATCH] uio_netx: Add support for netPLC cards Daniel Trautmann @ 2011-03-19 0:12 ` Hans J. Koch 2011-03-19 0:23 ` Greg KH 0 siblings, 1 reply; 4+ messages in thread From: Hans J. Koch @ 2011-03-19 0:12 UTC (permalink / raw) To: Daniel Trautmann Cc: gregkh@suse.de, linux-kernel@vger.kernel.org, Hans J. Koch, Manuel Traut On Thu, Mar 17, 2011 at 11:40:59AM +0000, Daniel Trautmann wrote: > This patch adds support for Hilscher / IBHsoftec netPLC cards to uio_netx userspace IO driver. > > Signed-off-by: Daniel Trautmann <dtrautmann@ibhsoftec-sps.de> > --- > drivers/uio/uio_netx.c | 19 +++++++++++++++++++ > 1 files changed, 19 insertions(+), 0 deletions(-) Against what kernel is that supposed to apply? It doesn't apply against Linus' current tree here. And, please, run your patch through scripts/checkpatch.pl before posting it. I get: ----------------------- total: 15 errors, 16 warnings, 37 lines checked NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or scripts/cleanfile ----------------------- I find 15 errors in 19 insertions a bit too much. Most of it is whitespace, so it might be a problem with your mail client. Please check. > > diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c > index 5ffdb48..7921190 100644 > --- a/drivers/uio/uio_netx.c > +++ b/drivers/uio/uio_netx.c > @@ -18,6 +18,9 @@ > > #define PCI_VENDOR_ID_HILSCHER 0x15CF > #define PCI_DEVICE_ID_HILSCHER_NETX 0x0000 > +#define PCI_DEVICE_ID_HILSCHER_NETPLC 0x0010 Hmpf, yes... The three defines above should go to include/linux/pci_ids.h I should have done that from the beginning, could you fix it now? > +#define PCI_SUBDEVICE_ID_NETPLC_RAM 0x0000 > +#define PCI_SUBDEVICE_ID_NETPLC_FLASH 0x0001 > #define PCI_SUBDEVICE_ID_NXSB_PCA 0x3235 > #define PCI_SUBDEVICE_ID_NXPCA 0x3335 > > @@ -66,6 +69,10 @@ static int __devinit netx_pci_probe(struct pci_dev *dev, > bar = 0; > info->name = "netx"; > break; > + case PCI_DEVICE_ID_HILSCHER_NETPLC: > + bar = 0; > + info->name = "netplc"; > + break; > default: > bar = 2; > info->name = "netx_plx"; > @@ -133,6 +140,18 @@ static struct pci_device_id netx_pci_ids[] = { > .subvendor = 0, > .subdevice = 0, > }, > + { > + .vendor = PCI_VENDOR_ID_HILSCHER, > + .device = PCI_DEVICE_ID_HILSCHER_NETPLC, > + .subvendor = PCI_VENDOR_ID_HILSCHER, > + .subdevice = PCI_SUBDEVICE_ID_NETPLC_RAM, > + }, > + { > + .vendor = PCI_VENDOR_ID_HILSCHER, > + .device = PCI_DEVICE_ID_HILSCHER_NETPLC, > + .subvendor = PCI_VENDOR_ID_HILSCHER, > + .subdevice = PCI_SUBDEVICE_ID_NETPLC_FLASH, > + }, > { > .vendor = PCI_VENDOR_ID_PLX, > .device = PCI_DEVICE_ID_PLX_9030, > Otherwise, the patch looks alright to me. Please post a new version that applies against the current kernel, and fix the whitespace errors. If it is a problem with your mail client, you should send the mail to yourself first. Save it, and run it through checkpatch. Thanks, Hans ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] uio_netx: Add support for netPLC cards 2011-03-19 0:12 ` Hans J. Koch @ 2011-03-19 0:23 ` Greg KH 2011-03-19 2:02 ` Hans J. Koch 0 siblings, 1 reply; 4+ messages in thread From: Greg KH @ 2011-03-19 0:23 UTC (permalink / raw) To: Hans J. Koch; +Cc: Daniel Trautmann, linux-kernel@vger.kernel.org, Manuel Traut On Sat, Mar 19, 2011 at 01:12:11AM +0100, Hans J. Koch wrote: > On Thu, Mar 17, 2011 at 11:40:59AM +0000, Daniel Trautmann wrote: > > This patch adds support for Hilscher / IBHsoftec netPLC cards to uio_netx userspace IO driver. > > > > Signed-off-by: Daniel Trautmann <dtrautmann@ibhsoftec-sps.de> > > --- > > drivers/uio/uio_netx.c | 19 +++++++++++++++++++ > > 1 files changed, 19 insertions(+), 0 deletions(-) > > Against what kernel is that supposed to apply? It doesn't apply against > Linus' current tree here. > > And, please, run your patch through scripts/checkpatch.pl before posting it. > > I get: > ----------------------- > total: 15 errors, 16 warnings, 37 lines checked > > NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or > scripts/cleanfile > ----------------------- > I find 15 errors in 19 insertions a bit too much. Most of it is whitespace, > so it might be a problem with your mail client. Please check. > > > > > diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c > > index 5ffdb48..7921190 100644 > > --- a/drivers/uio/uio_netx.c > > +++ b/drivers/uio/uio_netx.c > > @@ -18,6 +18,9 @@ > > > > #define PCI_VENDOR_ID_HILSCHER 0x15CF > > #define PCI_DEVICE_ID_HILSCHER_NETX 0x0000 > > +#define PCI_DEVICE_ID_HILSCHER_NETPLC 0x0010 > > Hmpf, yes... The three defines above should go to include/linux/pci_ids.h No, read the top of that file please. They belong here. > I should have done that from the beginning, could you fix it now? Please don't. thanks, greg k-h ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] uio_netx: Add support for netPLC cards 2011-03-19 0:23 ` Greg KH @ 2011-03-19 2:02 ` Hans J. Koch 0 siblings, 0 replies; 4+ messages in thread From: Hans J. Koch @ 2011-03-19 2:02 UTC (permalink / raw) To: Greg KH Cc: Hans J. Koch, Daniel Trautmann, linux-kernel@vger.kernel.org, Manuel Traut On Fri, Mar 18, 2011 at 05:23:35PM -0700, Greg KH wrote: > On Sat, Mar 19, 2011 at 01:12:11AM +0100, Hans J. Koch wrote: > > On Thu, Mar 17, 2011 at 11:40:59AM +0000, Daniel Trautmann wrote: > > > This patch adds support for Hilscher / IBHsoftec netPLC cards to uio_netx userspace IO driver. > > > > > > Signed-off-by: Daniel Trautmann <dtrautmann@ibhsoftec-sps.de> > > > --- > > > drivers/uio/uio_netx.c | 19 +++++++++++++++++++ > > > 1 files changed, 19 insertions(+), 0 deletions(-) > > > > Against what kernel is that supposed to apply? It doesn't apply against > > Linus' current tree here. > > > > And, please, run your patch through scripts/checkpatch.pl before posting it. > > > > I get: > > ----------------------- > > total: 15 errors, 16 warnings, 37 lines checked > > > > NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or > > scripts/cleanfile > > ----------------------- > > I find 15 errors in 19 insertions a bit too much. Most of it is whitespace, > > so it might be a problem with your mail client. Please check. > > > > > > > > diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c > > > index 5ffdb48..7921190 100644 > > > --- a/drivers/uio/uio_netx.c > > > +++ b/drivers/uio/uio_netx.c > > > @@ -18,6 +18,9 @@ > > > > > > #define PCI_VENDOR_ID_HILSCHER 0x15CF > > > #define PCI_DEVICE_ID_HILSCHER_NETX 0x0000 > > > +#define PCI_DEVICE_ID_HILSCHER_NETPLC 0x0010 > > > > Hmpf, yes... The three defines above should go to include/linux/pci_ids.h > > No, read the top of that file please. They belong here. Ooops, yes. > > > I should have done that from the beginning, could you fix it now? > > Please don't. Now I remember why I once put them here :) Thanks, Hans ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-19 2:02 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-03-17 11:40 [PATCH] uio_netx: Add support for netPLC cards Daniel Trautmann 2011-03-19 0:12 ` Hans J. Koch 2011-03-19 0:23 ` Greg KH 2011-03-19 2:02 ` Hans J. Koch
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).