* [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro
@ 2013-12-05 11:38 Yijing Wang
2013-12-05 22:06 ` Maciej W. Rozycki
0 siblings, 1 reply; 5+ messages in thread
From: Yijing Wang @ 2013-12-05 11:38 UTC (permalink / raw)
To: Maciej W. Rozycki, David S. Miller
Cc: netdev, linux-kernel, Yijing Wang, Hanjun Guo
Replace local marco DFX_BUS_PCI with PCI standard marco
dev_is_pci().
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
drivers/net/fddi/defxx.c | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 0b40e1c..0344f71 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -241,12 +241,6 @@ static char version[] =
*/
#define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128)
-#ifdef CONFIG_PCI
-#define DFX_BUS_PCI(dev) (dev->bus == &pci_bus_type)
-#else
-#define DFX_BUS_PCI(dev) 0
-#endif
-
#ifdef CONFIG_EISA
#define DFX_BUS_EISA(dev) (dev->bus == &eisa_bus_type)
#else
@@ -436,7 +430,7 @@ static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)
static void dfx_get_bars(struct device *bdev,
resource_size_t *bar_start, resource_size_t *bar_len)
{
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
int dfx_bus_tc = DFX_BUS_TC(bdev);
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -518,7 +512,7 @@ static const struct net_device_ops dfx_netdev_ops = {
static int dfx_register(struct device *bdev)
{
static int version_disp;
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_tc = DFX_BUS_TC(bdev);
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
const char *print_name = dev_name(bdev);
@@ -667,7 +661,7 @@ static void dfx_bus_init(struct net_device *dev)
{
DFX_board_t *bp = netdev_priv(dev);
struct device *bdev = bp->bus_dev;
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
int dfx_bus_tc = DFX_BUS_TC(bdev);
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -813,7 +807,7 @@ static void dfx_bus_uninit(struct net_device *dev)
{
DFX_board_t *bp = netdev_priv(dev);
struct device *bdev = bp->bus_dev;
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
u8 val;
@@ -967,7 +961,7 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
{
DFX_board_t *bp = netdev_priv(dev);
struct device *bdev = bp->bus_dev;
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
int dfx_bus_tc = DFX_BUS_TC(bdev);
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -1877,7 +1871,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id)
struct net_device *dev = dev_id;
DFX_board_t *bp = netdev_priv(dev);
struct device *bdev = bp->bus_dev;
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
int dfx_bus_tc = DFX_BUS_TC(bdev);
@@ -3579,7 +3573,7 @@ static void dfx_unregister(struct device *bdev)
{
struct net_device *dev = dev_get_drvdata(bdev);
DFX_board_t *bp = netdev_priv(dev);
- int dfx_bus_pci = DFX_BUS_PCI(bdev);
+ int dfx_bus_pci = dev_is_pci(bdev);
int dfx_bus_tc = DFX_BUS_TC(bdev);
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
resource_size_t bar_start = 0; /* pointer to port */
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro
2013-12-05 11:38 [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro Yijing Wang
@ 2013-12-05 22:06 ` Maciej W. Rozycki
2013-12-06 3:06 ` Yijing Wang
0 siblings, 1 reply; 5+ messages in thread
From: Maciej W. Rozycki @ 2013-12-05 22:06 UTC (permalink / raw)
To: Yijing Wang; +Cc: David S. Miller, netdev, linux-kernel, Hanjun Guo
On Thu, 5 Dec 2013, Yijing Wang wrote:
> Replace local marco DFX_BUS_PCI with PCI standard marco
> dev_is_pci().
Typos above: marco -> macro
> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
> ---
> drivers/net/fddi/defxx.c | 20 +++++++-------------
> 1 files changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
> index 0b40e1c..0344f71 100644
> --- a/drivers/net/fddi/defxx.c
> +++ b/drivers/net/fddi/defxx.c
> @@ -241,12 +241,6 @@ static char version[] =
> */
> #define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128)
>
> -#ifdef CONFIG_PCI
> -#define DFX_BUS_PCI(dev) (dev->bus == &pci_bus_type)
> -#else
> -#define DFX_BUS_PCI(dev) 0
> -#endif
> -
> #ifdef CONFIG_EISA
> #define DFX_BUS_EISA(dev) (dev->bus == &eisa_bus_type)
> #else
> @@ -436,7 +430,7 @@ static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)
> static void dfx_get_bars(struct device *bdev,
> resource_size_t *bar_start, resource_size_t *bar_len)
> {
> - int dfx_bus_pci = DFX_BUS_PCI(bdev);
> + int dfx_bus_pci = dev_is_pci(bdev);
> int dfx_bus_eisa = DFX_BUS_EISA(bdev);
> int dfx_bus_tc = DFX_BUS_TC(bdev);
> int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
Maciej
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro
2013-12-05 22:06 ` Maciej W. Rozycki
@ 2013-12-06 3:06 ` Yijing Wang
2013-12-06 4:44 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Yijing Wang @ 2013-12-06 3:06 UTC (permalink / raw)
To: Maciej W. Rozycki, David S. Miller; +Cc: netdev, linux-kernel, Hanjun Guo
On 2013/12/6 6:06, Maciej W. Rozycki wrote:
> On Thu, 5 Dec 2013, Yijing Wang wrote:
>
>> Replace local marco DFX_BUS_PCI with PCI standard marco
>> dev_is_pci().
>
> Typos above: marco -> macro
Sorry for the mistake, David, should i need to resend this patch to fix this typo error?
>
>> Signed-off-by: Yijing Wang <wangyijing@huawei.com>
>> ---
>> drivers/net/fddi/defxx.c | 20 +++++++-------------
>> 1 files changed, 7 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
>> index 0b40e1c..0344f71 100644
>> --- a/drivers/net/fddi/defxx.c
>> +++ b/drivers/net/fddi/defxx.c
>> @@ -241,12 +241,6 @@ static char version[] =
>> */
>> #define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128)
>>
>> -#ifdef CONFIG_PCI
>> -#define DFX_BUS_PCI(dev) (dev->bus == &pci_bus_type)
>> -#else
>> -#define DFX_BUS_PCI(dev) 0
>> -#endif
>> -
>> #ifdef CONFIG_EISA
>> #define DFX_BUS_EISA(dev) (dev->bus == &eisa_bus_type)
>> #else
>> @@ -436,7 +430,7 @@ static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)
>> static void dfx_get_bars(struct device *bdev,
>> resource_size_t *bar_start, resource_size_t *bar_len)
>> {
>> - int dfx_bus_pci = DFX_BUS_PCI(bdev);
>> + int dfx_bus_pci = dev_is_pci(bdev);
>> int dfx_bus_eisa = DFX_BUS_EISA(bdev);
>> int dfx_bus_tc = DFX_BUS_TC(bdev);
>> int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
>
> Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
>
> Maciej
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
--
Thanks!
Yijing
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro
2013-12-06 3:06 ` Yijing Wang
@ 2013-12-06 4:44 ` David Miller
2013-12-06 7:11 ` Yijing Wang
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2013-12-06 4:44 UTC (permalink / raw)
To: wangyijing; +Cc: macro, netdev, linux-kernel, guohanjun
From: Yijing Wang <wangyijing@huawei.com>
Date: Fri, 6 Dec 2013 11:06:28 +0800
> On 2013/12/6 6:06, Maciej W. Rozycki wrote:
>> On Thu, 5 Dec 2013, Yijing Wang wrote:
>>
>>> Replace local marco DFX_BUS_PCI with PCI standard marco
>>> dev_is_pci().
>>
>> Typos above: marco -> macro
>
> Sorry for the mistake, David, should i need to resend this patch to fix this typo error?
You have to resubmit all of these conversions again because you posted
them before the net-next tree was even open for submissions.
So you might as well fix the typos etc. while doing so.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro
2013-12-06 4:44 ` David Miller
@ 2013-12-06 7:11 ` Yijing Wang
0 siblings, 0 replies; 5+ messages in thread
From: Yijing Wang @ 2013-12-06 7:11 UTC (permalink / raw)
To: David Miller; +Cc: macro, netdev, linux-kernel, guohanjun
On 2013/12/6 12:44, David Miller wrote:
> From: Yijing Wang <wangyijing@huawei.com>
> Date: Fri, 6 Dec 2013 11:06:28 +0800
>
>> On 2013/12/6 6:06, Maciej W. Rozycki wrote:
>>> On Thu, 5 Dec 2013, Yijing Wang wrote:
>>>
>>>> Replace local marco DFX_BUS_PCI with PCI standard marco
>>>> dev_is_pci().
>>>
>>> Typos above: marco -> macro
>>
>> Sorry for the mistake, David, should i need to resend this patch to fix this typo error?
>
> You have to resubmit all of these conversions again because you posted
> them before the net-next tree was even open for submissions.
>
> So you might as well fix the typos etc. while doing so.
>
>
OK, I have resent the two refreshed patches.
Thanks!
Yijing.
--
Thanks!
Yijing
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-12-06 7:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-05 11:38 [PATCH 2/2] net/fddi: Replace local marco with PCI standard macro Yijing Wang
2013-12-05 22:06 ` Maciej W. Rozycki
2013-12-06 3:06 ` Yijing Wang
2013-12-06 4:44 ` David Miller
2013-12-06 7:11 ` Yijing Wang
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).